* More utf-8 fixes from Recai, partly to things I broke above:

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

diff --git a/debian/rules b/debian/rules
index f64efb776a21334d82dffccdefda1000ab78941f..48ce274db6e1908eb5bf9ae11955140a218c336e 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,7 @@ build-stamp:
        dh_testdir
        perl Makefile.PL
        $(MAKE)
        dh_testdir
        perl Makefile.PL
        $(MAKE)

+       $(MAKE) test

        touch build-stamp
 
 clean:
        touch build-stamp
 
 clean:


@@ -23,12 +24,9 @@ binary-indep: build
        dh_clean -k
        $(MAKE) pure_install INSTALLDIRS=vendor \
                PREFIX=$(shell pwd)/debian/ikiwiki/$(shell perl -MConfig -e 'print $$Config{prefix}')
        dh_clean -k
        $(MAKE) pure_install INSTALLDIRS=vendor \
                PREFIX=$(shell pwd)/debian/ikiwiki/$(shell perl -MConfig -e 'print $$Config{prefix}')

-       dh_install debian/wikilist etc/ikiwiki
+       dh_install wikilist etc/ikiwiki

        dh_installdocs html
        dh_link usr/share/common-licenses/GPL usr/share/doc/ikiwiki/html/GPL
        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_installchangelogs
        dh_compress -X html
        dh_fixperms
        dh_installchangelogs
        dh_compress -X html
        dh_fixperms


@@ -40,7 +38,7 @@ binary-indep: build
 
 # Not intended for use by anyone except the author.
 announcedir:
 
 # Not intended for use by anyone except the author.
 announcedir:

-       @echo ${HOME}/src/ikiwiki/news
+       @echo ${HOME}/src/ikiwiki/doc/news

 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary