r528 - devmapper/trunk/debian

[Bastian Blank]

Author: waldi
Date: Tue Jan  8 16:40:09 2008
New Revision: 528

Log:
debian/rules: Update.


Modified:
   devmapper/trunk/debian/rules

Modified: devmapper/trunk/debian/rules
==============================================================================
--- devmapper/trunk/debian/rules	(original)
+++ devmapper/trunk/debian/rules	Tue Jan  8 16:40:09 2008
@@ -3,8 +3,8 @@
 # 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)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 SOURCE := $(shell dpkg-parsechangelog | sed -ne 's,^Source: *\(.*\)$$,\1,p')
 VERSION_DEBIAN := $(shell dpkg-parsechangelog | sed -ne 's,^Version: *\(.*\)$$,\1,p')
@@ -25,15 +25,15 @@
 PACKAGES_DEB := libdevmapper-dev libdevmapper$(LIBDEVMAPPER_ABINAME) dmsetup
 PACKAGES_UDEB := libdevmapper$(LIBDEVMAPPER_ABINAME)-udeb dmsetup-udeb
 
-CONFIGURE_ARGS = --build $(DEB_BUILD_GNU_TYPE)
+CONFIGURE_FLAGS = --build $(DEB_BUILD_GNU_TYPE)
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-CONFIGURE_ARGS += --host $(DEB_HOST_GNU_TYPE)
+CONFIGURE_FLAGS += --host $(DEB_HOST_GNU_TYPE)
 endif
 
-CONFIGURE_ARGS += \
-		--prefix=/usr \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info
+CONFIGURE_FLAGS += \
+	--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
@@ -48,7 +48,7 @@
 	cd $(DIR); autoreconf
 	cd $(DIR); \
 	./configure \
-		$(CONFIGURE_ARGS) \
+		$(CONFIGURE_FLAGS) \
 		--enable-compat \
 		--enable-pkgconfig \
 		--with-device-uid=0 \
@@ -67,7 +67,7 @@
 	cd $(DIR); autoreconf
 	cd $(DIR); \
 	./configure \
-		$(CONFIGURE_ARGS) \
+		$(CONFIGURE_FLAGS) \
 		--with-optimisation=-Os \
 		--enable-compat \
 		--disable-selinux