Merge branch 'master' into buildsystems

[debhelper.git] / Makefile

diff --git a/Makefile b/Makefile
index 67dd89e565b4f2f008f433912038f4b16c1a0886..f13b3fc9c20b6b4d495eb33bb7446b6e38013e06 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -31,16 +31,16 @@ POD2MAN=pod2man -c Debhelper -r "$(VERSION)"
 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; \
@@ -63,10 +63,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