Merge branch 'master' of ssh://git.debian.org/git/debhelper/debhelper

[debhelper.git] / Makefile

diff --git a/Makefile b/Makefile
index 6fe4d33525d9ac82a80d8866e37f5a581c7db8a5..2657534e91594eeeeb04b0d62ab25e8f6b0fe80a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,7 +25,7 @@ VERSION=$(shell expr "`dpkg-parsechangelog |grep Version:`" : '.*Version: \(.*\)
 
 PERLLIBDIR=$(shell perl -MConfig -e 'print $$Config{vendorlib}')/Debian/Debhelper
 
-POD2MAN=pod2man -c Debhelper -r "$(VERSION)"
+POD2MAN=pod2man --utf8 -c Debhelper -r "$(VERSION)"
 
 # l10n to be built is determined from .po files
 LANGS=$(notdir $(basename $(wildcard man/po4a/po/*.po)))
@@ -65,13 +65,15 @@ clean:
 install:
        install -d $(DESTDIR)/usr/bin \
                $(DESTDIR)/usr/share/debhelper/autoscripts \
-               $(DESTDIR)$(PERLLIBDIR)/Sequence
+               $(DESTDIR)$(PERLLIBDIR)/Sequence \
+               $(DESTDIR)$(PERLLIBDIR)/Buildsystem
        install $(shell find -maxdepth 1 -mindepth 1 -name dh\* |grep -v \.1\$$) $(DESTDIR)/usr/bin
        install -m 0644 autoscripts/* $(DESTDIR)/usr/share/debhelper/autoscripts
        install -m 0644 Debian/Debhelper/*.pm $(DESTDIR)$(PERLLIBDIR)
        install -m 0644 Debian/Debhelper/Sequence/*.pm $(DESTDIR)$(PERLLIBDIR)/Sequence
+       install -m 0644 Debian/Debhelper/Buildsystem/*.pm $(DESTDIR)$(PERLLIBDIR)/Buildsystem
 
 test: version
-       ./run perl -MTest::Harness -e 'runtests grep { ! /CVS/ && ! /\.svn/ } @ARGV' t/*
+       ./run perl -MTest::Harness -e 'runtests grep { ! /CVS/ && ! /\.svn/ && -f && -x } @ARGV' t/* t/buildsystems/*
        # clean up log etc
        ./run dh_clean