[Forensics-changes] [SCM] Recursively compute hashsums or piecewise hashings branch, debian, updated. upstream/3.1-16-g0537504

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit a532f3dea6d0bece7ecce78a37ebd30d63da803e
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Sep 18 18:40:53 2008 +0200

    Some cosmetic corrections in rules file.

diff --git a/debian/rules b/debian/rules
index 102dfdc..ca18501 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
 	CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
@@ -13,9 +13,9 @@ clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
+	rm -f config.guess config.sub
 
 	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.sub config.guess
 
 	dh_clean
 
@@ -28,17 +28,16 @@ endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
+	CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
 
 build: build-stamp
-
 build-stamp:  config.status
 	dh_testdir
 
 	$(MAKE)
 
-	touch $@
+	touch build-stamp
 
 install: build
 	dh_testdir
@@ -48,8 +47,7 @@ install: build
 
 	$(MAKE) DESTDIR=$(CURDIR)/debian/md5deep install
 
-
-binary-indep: build install
+binary: binary-indep binary-arch
 
 binary-arch: build install
 	dh_testdir
@@ -68,5 +66,6 @@ binary-arch: build install
 	dh_md5sums
 	dh_builddeb
 
-binary: binary-indep binary-arch
-.PHONY: clean configure build install binary binary-arch binary-indep
+binary-indep: build install
+
+.PHONY: clean build install binary binary-arch binary-indep

-- 
Recursively compute hashsums or piecewise hashings