Merge commit 'upstream/master' into prv/po

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

diff --git a/debian/rules b/debian/rules
index 6ca612c9ee82f72daaf92cdf81165d7eb52abb41..2434d92c8e069ecdf5d67da4388ed3ceab3fc5d2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -3,8 +3,10 @@
 build: build-stamp
 build-stamp:
        dh_testdir
-       perl Makefile.PL
+       perl Makefile.PL PREFIX=/usr INSTALLDIRS=vendor
+       $(MAKE) -C po
        $(MAKE)
+       $(MAKE) test
        touch build-stamp
 
 clean:
@@ -12,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
@@ -21,13 +23,11 @@ binary-indep: build
        dh_testdir
        dh_testroot
        dh_clean -k
-       $(MAKE) pure_install INSTALLDIRS=vendor \
-               PREFIX=$(shell pwd)/debian/ikiwiki/$(shell perl -MConfig -e 'print $$Config{prefix}')
+       $(MAKE) pure_install DESTDIR=$(shell pwd)/debian/ikiwiki
        dh_installdocs html
-       dh_link usr/share/common-licenses/GPL usr/share/doc/ikiwiki/html/GPL
-       dh_link usr/share/ikiwiki/basewiki \
-               usr/share/doc/ikiwiki/examples/basewiki
-       dh_installman ikiwiki.man
+       dh_link usr/share/ikiwiki/examples usr/share/doc/ikiwiki/examples
+       dh_link usr/share/common-licenses/GPL-2 usr/share/doc/ikiwiki/html/GPL
+       dh_installexamples
        dh_installchangelogs
        dh_compress -X html
        dh_fixperms
@@ -37,5 +37,9 @@ binary-indep: build
        dh_md5sums
        dh_builddeb
 
+# Not intended for use by anyone except the author.
+announcedir:
+       @echo ${HOME}/src/ikiwiki/doc/news
+
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary