daemon: further tweaks.

diff --git a/debian/rules b/debian/rules
old mode 100644 (file)
new mode 100755 (executable)
index 9445101..4ab221c
--- a/debian/rules
+++ b/debian/rules
@@ -12,6 +12,23 @@ 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
+
+# We do have the requisite perl modules in the mainline, and
+# have no reason to shy away from this script.
+export WITH_SEND_EMAIL=YesPlease
+
 PREFIX := /usr
 MANDIR := /usr/share/man/
 
@@ -21,10 +38,10 @@ DESTDIR  := $(CURDIR)/debian/tmp
 DOC_DESTDIR := $(DESTDIR)/usr/share/doc/git-core/
 MAN_DESTDIR := $(DESTDIR)/$(MANDIR)
 
-build: build-stamp
-build-stamp:
+build: debian/build-stamp
+debian/build-stamp:
        dh_testdir
-       $(MAKE) all doc
+       $(MAKE) prefix=$(PREFIX) PYTHON_PATH=/usr/bin/python2.4 all test doc
        touch debian/build-stamp
 
 debian-clean:
@@ -36,46 +53,57 @@ debian-clean:
 clean: debian-clean
        $(MAKE) clean
 
-install: debian/build-stamp
+install: build
        dh_testdir
        dh_testroot
        dh_clean -k 
        dh_installdirs 
 
-       make dest=$(DESTDIR) prefix=$(PREFIX) mandir=$(MANDIR) install install-doc
+       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_install --sourcedir=$(DESTDIR)
+       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/^/? /'
 
-binary:
+binary-arch: build install
        dh_testdir
        dh_testroot
-       dh_installchangelogs
-       dh_installdocs
-       dh_installexamples
-#      dh_installmenu
-#      dh_installdebconf       
-#      dh_installlogrotate     
-#      dh_installemacsen
-#      dh_installpam
-#      dh_installmime
-#      dh_installinit
-#      dh_installcron
-#      dh_installinfo
-       dh_installman
-       dh_link
-       dh_strip
-       dh_compress 
-       dh_fixperms
-#      dh_perl
-#      dh_python
-       dh_makeshlibs
-       dh_installdeb
-       dh_shlibdeps
-       dh_gencontrol
-       dh_md5sums
-       dh_builddeb
+       dh_installchangelogs -a
+       dh_installdocs -a
+       dh_strip -a
+       dh_compress  -a
+       dh_fixperms -a
+       dh_perl -a
+       dh_makeshlibs -a
+       dh_installdeb -a
+       dh_shlibdeps -a
+       dh_gencontrol -a
+       dh_md5sums -a
+       dh_builddeb -a
+
+binary-indep: build install
+       dh_testdir
+       dh_testroot
+       dh_installchangelogs -i
+       dh_installdocs -i
+       dh_compress  -i
+       dh_fixperms -i
+       dh_makeshlibs -i
+       dh_installdeb -i
+       dh_shlibdeps -i
+       dh_gencontrol -i
+       dh_md5sums -i
+       dh_builddeb -i
+
+binary: binary-arch binary-indep
 
 .PHONY: build clean binary install clean debian-clean