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

[debhelper.git] / Makefile

diff --git a/Makefile b/Makefile
index d331ec1cbf0c5ea3110b3f978415cdeb031e4a1a..cde11399d95d418019496219485cb4246eefb82b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -36,7 +36,7 @@ build: version
        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; \
@@ -63,10 +63,13 @@ 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
+       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
 
 test: version
        ./run perl -MTest::Harness -e 'runtests grep { ! /CVS/ && ! /\.svn/ } @ARGV' t/*
+       # clean up log etc
+       ./run dh_clean