r511 - devmapper/trunk/debian

[Bastian Blank]

Author: waldi
Date: Wed Jan  2 14:07:19 2008
New Revision: 511

Log:
* debian/changelog: Update.
* debian/rules
  - Merge common configure arguments.
  - Add --build.


Modified:
   devmapper/trunk/debian/changelog
   devmapper/trunk/debian/rules

Modified: devmapper/trunk/debian/changelog
==============================================================================
--- devmapper/trunk/debian/changelog	(original)
+++ devmapper/trunk/debian/changelog	Wed Jan  2 14:07:19 2008
@@ -6,8 +6,9 @@
   * Remove init script. (closes: #361358, #375340, #384900, #419958)
   * Cleanup udeb relations. (closes: #419604)
   * Fix pkgconfig file for static linking. (closes: #390243)
+  * Supply proper --host and --build args to configure. (closes: #451136)
 
- -- Bastian Blank <waldi at debian.org>  Wed, 02 Jan 2008 12:52:15 +0000
+ -- Bastian Blank <waldi at debian.org>  Wed, 02 Jan 2008 14:06:25 +0000
 
 devmapper (2:1.02.20-2) unstable; urgency=low
 

Modified: devmapper/trunk/debian/rules
==============================================================================
--- devmapper/trunk/debian/rules	(original)
+++ devmapper/trunk/debian/rules	Wed Jan  2 14:07:19 2008
@@ -3,6 +3,9 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
+DEB_BUILD_GNU_TYPE := $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE := $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+
 SOURCE := $(shell dpkg-parsechangelog | sed -ne 's,^Source: *\(.*\)$$,\1,p')
 VERSION_DEBIAN := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p')
 VERSION := $(shell echo "$(VERSION_DEBIAN)" | sed -e 's,^[0-9]*:,,' -e 's,-[^-]*$$,,')
@@ -22,6 +25,16 @@
 PACKAGES_DEB := libdevmapper-dev libdevmapper$(LIBDEVMAPPER_ABINAME) dmsetup
 PACKAGES_UDEB := libdevmapper$(LIBDEVMAPPER_ABINAME)-udeb dmsetup-udeb
 
+CONFIGURE_ARGS = --build $(DEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CONFIGURE_ARGS += --host $(DEB_HOST_GNU_TYPE)
+endif
+
+CONFIGURE_ARGS += \
+		--prefix=/usr \
+		--mandir=\$${prefix}/share/man \
+		--infodir=\$${prefix}/share/info
+
 setup: $(STAMPS_DIR)/setup
 $(STAMPS_DIR)/setup: $(BUILD_DIR) $(STAMPS_DIR) $(STAMPS_DIR)/setup-deb $(STAMPS_DIR)/setup-udeb
 
@@ -35,9 +48,7 @@
 	cd $(DIR); autoreconf
 	cd $(DIR); \
 	./configure \
-		--prefix=/usr \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
+		$(CONFIGURE_ARGS) \
 		--enable-compat \
 		--enable-pkgconfig \
 		--with-device-uid=0 \
@@ -56,9 +67,7 @@
 	cd $(DIR); autoreconf
 	cd $(DIR); \
 	./configure \
-		--prefix=/usr \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
+		$(CONFIGURE_ARGS) \
 		--with-optimisation=-Os \
 		--enable-compat \
 		--disable-selinux