Merge commit 'upstream/master' into pub/master

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

diff --git a/debian/rules b/debian/rules
index 9dedd3c452a9f5fc5997e3c7d05588e49a5b0c8c..25b1f57b6a636ffe170efaf6b208bb61346ef9b9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,6 +4,7 @@ build: build-stamp
 build-stamp:
        dh_testdir
        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
@@ -23,10 +24,9 @@ binary-indep: build
        dh_testroot
        dh_clean -k
        $(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_link usr/share/common-licenses/GPL-2 usr/share/doc/ikiwiki/html/GPL
        dh_installchangelogs
        dh_compress -X html
        dh_fixperms