[Forensics-changes] [SCM] UNNAMED PROJECT branch, debian, updated. upstream/6.12.3-13-g1a36f78

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 1a36f78c0bb335356d93d7bea2cfaa6cc3018317
Author: Daniel Baumann <daniel at debian.org>
Date:   Thu Jul 9 16:22:05 2009 +0200

    Updating rules file to current state of the art.

diff --git a/debian/rules b/debian/rules
index 6c5f8f0..d7b2a22 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,19 @@
 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=CC=$(DEB_HOST_GNU_TYPE)-gcc
+else
+	CROSS=
+endif
+
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
+	rm -f config.sub config.guess
 
 	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f config.sub config.guess
 
 	dh_clean
 
@@ -23,7 +29,7 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
 
-	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+	./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
 
 build: build-stamp
 build-stamp: config.status
@@ -37,13 +43,12 @@ install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k
-	dh_installdirs
 
-	$(MAKE) DESTDIR=$(CURDIR)/debian/dc3dd install
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/dc3dd
 
 binary: binary-arch
 
-binary-arch: build install
+binary-arch: install
 	dh_testdir
 	dh_testroot
 	dh_installchangelogs ChangeLog

-- 
UNNAMED PROJECT