Merge branch 'master' into pedigree

[git.ikiwiki.info.git] / debian / rules

diff --git a/debian/rules b/debian/rules
index 4e14b5ca34cb11f4580d116d1f65aa9b85f89e0e..2af69a5f793753418b8a31a4e6376ccb41479f90 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,8 @@
 build: build-stamp
 build-stamp:
        dh_testdir
-       perl Makefile.PL PREFIX=/usr
+       perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor
+       $(MAKE) -C po
        $(MAKE)
        $(MAKE) test
        touch build-stamp
@@ -13,7 +14,7 @@ clean:
        dh_testroot
        rm -f build-stamp
        perl Makefile.PL
-       -$(MAKE) realclean
+       if [ -e Makefile ]; then $(MAKE) realclean; fi
        dh_clean
 
 binary-arch: build
@@ -22,12 +23,11 @@ binary-indep: build
        dh_testdir
        dh_testroot
        dh_clean -k
-       $(MAKE) pure_install INSTALLDIRS=vendor \
-               DESTDIR=$(shell pwd)/debian/ikiwiki
+       $(MAKE) pure_install DESTDIR=$(shell pwd)/debian/ikiwiki
        dh_install wikilist etc/ikiwiki
        dh_installdocs html
-       dh_installexamples doc/examples
-       dh_link usr/share/common-licenses/GPL usr/share/doc/ikiwiki/html/GPL
+       dh_installexamples doc/examples/*
+       dh_link usr/share/common-licenses/GPL-2 usr/share/doc/ikiwiki/html/GPL
        dh_installchangelogs
        dh_compress -X html
        dh_fixperms