[Pkg-corba-commits] r27 - /trunk/omniorb4/debian/rules

Thu Oct 18 08:12:15 UTC 2007

Author: tgg
Date: Thu Oct 18 08:12:15 2007
New Revision: 27

URL: http://svn.debian.org/wsvn/pkg-corba/?sc=1&rev=27
Log:
correct --build and --host flags for configure

Modified:
    trunk/omniorb4/debian/rules

Modified: trunk/omniorb4/debian/rules
URL: http://svn.debian.org/wsvn/pkg-corba/trunk/omniorb4/debian/rules?rev=27&op=diff
==============================================================================

--- trunk/omniorb4/debian/rules (original)
+++ trunk/omniorb4/debian/rules Thu Oct 18 08:12:15 2007
@@ -3,11 +3,13 @@
 # Uncomment this to turn on verbose mode. 
 #export DH_VERBOSE=1
 
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -g
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-INSTALL_PROGRAM += -s
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+  confflags += --build $(DEB_HOST_GNU_TYPE)
+else
+  confflags += --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
 endif
 
 build/config.status:
@@ -15,7 +17,7 @@
 	cp -f /usr/share/misc/config.sub /usr/share/misc/config.guess bin/scripts
 	-mkdir build
 	cd build && \
-	../configure \
+	../configure $(confflags) \
 		--prefix=/usr \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \


