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

[debhelper.git] / Makefile

diff --git a/Makefile b/Makefile
index 67dd89e565b4f2f008f433912038f4b16c1a0886..2657534e91594eeeeb04b0d62ab25e8f6b0fe80a 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -25,28 +25,30 @@ 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)))
 
 build: version
-       find . -maxdepth 1 -type f -perm +100 -name "dh_*" \
+       find . -maxdepth 1 -type f -perm +100 -name "dh*" \
                -exec $(POD2MAN) {} {}.1 \;
        cat debhelper.pod | \
                $(MAKEMANLIST) `find . -maxdepth 1 -type f -perm +100 -name "dh_*" | sort` | \
                $(POD2MAN) --name="debhelper" --section=7  > debhelper.7
-       po4a man/po4a/po4a.cfg 
+       po4a -L UTF-8 man/po4a/po4a.cfg 
        set -e; \
        for lang in $(LANGS); do \
                dir=man/$$lang; \
-               for file in $$dir/dh_*.pod; do \
+               for file in $$dir/dh*.pod; do \
                        prog=`basename $$file | sed 's/.pod//'`; \
                        $(POD2MAN) $$file $$prog.$$lang.1; \
                done; \
-               cat $$dir/debhelper.pod | \
-                       $(MAKEMANLIST) `find $$dir -type f -maxdepth 1 -name "dh_*.pod" | sort` | \
-                       $(POD2MAN) --name="debhelper" --section=7 > debhelper.$$lang.7; \
+               if [ -e $$dir/debhelper.pod ]; then \
+                       cat $$dir/debhelper.pod | \
+                               $(MAKEMANLIST) `find $$dir -type f -maxdepth 1 -name "dh_*.pod" | sort` | \
+                               $(POD2MAN) --name="debhelper" --section=7 > debhelper.$$lang.7; \
+               fi; \
        done
 
 version:
@@ -63,10 +65,15 @@ clean:
 install:
        install -d $(DESTDIR)/usr/bin \
                $(DESTDIR)/usr/share/debhelper/autoscripts \
-               $(DESTDIR)$(PERLLIBDIR)
-       install $(shell find -maxdepth 1 -mindepth 1 -name dh_\* |grep -v \.1\$) $(DESTDIR)/usr/bin
+               $(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