Merge branch 'master' into next

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

diff --git a/debian/rules b/debian/rules
index bf0c65a43e6a1b93de4ce764fbd021ca02593442..25b1f57b6a636ffe170efaf6b208bb61346ef9b9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,8 @@ build: build-stamp
 build-stamp:
        dh_testdir
        perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor
-       # taint checking disabled due to perl bug #411786
-       NOTAINT=1 $(MAKE)
+       $(MAKE) -C po
+       $(MAKE)
        $(MAKE) test
        touch build-stamp
 
@@ -24,7 +24,6 @@ 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-2 usr/share/doc/ikiwiki/html/GPL