Merge with master.

diff --git a/debian/rules b/debian/rules
index 67830b03b9c3b867e8363aea858112a2262a13d5..2c575ffa1929f392df751f991c561c623f5a06f2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ MAN_DESTDIR := $(DESTDIR)/$(MANDIR)
 build: debian/build-stamp
 debian/build-stamp:
        dh_testdir
-       $(MAKE) all doc
+       $(MAKE) prefix=$(PREFIX) all doc
        touch debian/build-stamp
 
 debian-clean:
@@ -56,7 +56,7 @@ install: build
        dh_clean -k 
        dh_installdirs 
 
-       make dest=$(DESTDIR) prefix=$(PREFIX) mandir=$(MANDIR) install install-doc
+       make dest=$(DESTDIR) prefix=$(PREFIX) mandir=$(MANDIR) install install-tools install-doc
 
        mkdir -p $(DOC_DESTDIR)
        find $(DOC) '(' -name '*.txt' -o -name '*.html' ')' -exec install {} $(DOC_DESTDIR) ';'