Merge with master.

diff --git a/debian/rules b/debian/rules
index aff43b836ddf857b35b1123f6c300a32ab43797e..2c575ffa1929f392df751f991c561c623f5a06f2 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,20 @@ else
 endif
 export CFLAGS
 
+#
+# On PowerPC we compile against the hand-crafted assembly, on all
+# other architectures we compile against GPL'ed sha1 code lifted
+# from Mozilla.  OpenSSL is strangely licensed and best avoided
+# in Debian.
+#
+HOST_ARCH=$(shell dpkg-architecture -qDEB_HOST_ARCH)
+ifeq (${HOST_ARCH},powerpc)
+       export PPC_SHA1=YesPlease
+else
+       export MOZILLA_SHA1=YesPlease
+endif
+
+
 PREFIX := /usr
 MANDIR := /usr/share/man/
 
@@ -24,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:
@@ -42,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) ';'