[Forensics-changes] [SCM] debian-forensics/scrounge-ntfs branch, debian, updated. debian/0.9-2-4-g87186b4

[Daniel Baumann]

The following commit has been merged in the debian branch:
commit 87186b46b13122c817272e8cf70b2499cced0823
Author: Daniel Baumann <daniel at debian.org>
Date:   Wed Jun 11 09:51:12 2008 +0200

    Cleaning up rules.

diff --git a/debian/rules b/debian/rules
index 40579d3..01c3506 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,23 +1,21 @@
 #!/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)
 
-CFLAGS = -Wall -g
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+	CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 else
-	CFLAGS += -O2
+	CROSS= --build $(DEB_BUILD_GNU_TYPE)
 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
 
@@ -31,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 CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs"
+	CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./configure $(CROSS) --prefix=/usr --mandir=\$${prefix}/share/man
 
 build: build-stamp
 build-stamp: config.status

-- 
debian-forensics/scrounge-ntfs