daemon: further tweaks.

diff --git a/debian/rules b/debian/rules
index 568d430932bf96efd9c6a448adbb42507c821a0f..4ab221ce9ea5a24201b1bf37c3c9d07eff243770 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -41,7 +41,7 @@ MAN_DESTDIR := $(DESTDIR)/$(MANDIR)
 build: debian/build-stamp
 debian/build-stamp:
        dh_testdir
-       $(MAKE) prefix=$(PREFIX) PYTHON_PATH=/usr/bin/python2.4 all doc test
+       $(MAKE) prefix=$(PREFIX) PYTHON_PATH=/usr/bin/python2.4 all test doc
        touch debian/build-stamp
 
 debian-clean:
@@ -62,10 +62,15 @@ install: build
        make DESTDIR=$(DESTDIR) prefix=$(PREFIX) mandir=$(MANDIR) \
                install install-doc
 
-       mkdir -p $(DOC_DESTDIR)
-       find $(DOC) '(' -name '*.txt' -o -name '*.html' ')' -exec install {} $(DOC_DESTDIR) ';'
+       make -C Documentation DESTDIR=$(DESTDIR) prefix=$(PREFIX) \
+               WEBDOC_DEST=$(DOC_DESTDIR) install-webdoc
 
+       dh_movefiles -p git-arch
+       dh_movefiles -p git-cvs
+       dh_movefiles -p git-svn
        dh_movefiles -p git-tk
+       dh_movefiles -p git-email
+       dh_movefiles -p git-doc
        dh_movefiles -p git-core
        find debian/tmp -type d -o -print | sed -e 's/^/? /'