Merge with gitk.

[git.git] / debian / rules

diff --git a/debian/rules b/debian/rules
old mode 100644 (file)
new mode 100755 (executable)
index 9445101..67830b0
--- 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/
 
@@ -21,8 +35,8 @@ 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
        touch debian/build-stamp
@@ -36,7 +50,7 @@ debian-clean:
 clean: debian-clean
        $(MAKE) clean
 
-install: debian/build-stamp
+install: build
        dh_testdir
        dh_testroot
        dh_clean -k 
@@ -47,9 +61,9 @@ install: debian/build-stamp
        mkdir -p $(DOC_DESTDIR)
        find $(DOC) '(' -name '*.txt' -o -name '*.html' ')' -exec install {} $(DOC_DESTDIR) ';'
 
-       dh_install --sourcedir=$(DESTDIR)
+       dh_install --list-missing --sourcedir=$(DESTDIR)
 
-binary:
+binary: build install
        dh_testdir
        dh_testroot
        dh_installchangelogs