[Pkg-ocaml-maint-commits] r2891 - in /trunk/packages/numerix/trunk/debian: changelog rules

[jcristau-guest at users.alioth.debian.org]

Author: jcristau-guest
Date: Sun Jul  9 16:49:00 2006
New Revision: 2891

URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/?sc=1&rev=2891
Log:
Don't tell configure we're cross-compiling if that's not the case.

Modified:
    trunk/packages/numerix/trunk/debian/changelog
    trunk/packages/numerix/trunk/debian/rules

Modified: trunk/packages/numerix/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/numerix/trunk/debian/changelog?rev=2891&op=diff
==============================================================================
--- trunk/packages/numerix/trunk/debian/changelog (original)
+++ trunk/packages/numerix/trunk/debian/changelog Sun Jul  9 16:49:00 2006
@@ -1,3 +1,9 @@
+numerix (0.22-2) unstable; urgency=low
+
+  * Don't tell configure we're cross-compiling if that's not the case.
+
+ -- Julien Cristau <julien.cristau at ens-lyon.org>  Sun,  9 Jul 2006 18:47:37 +0200
+
 numerix (0.22-1) unstable; urgency=low
 
   * New upstream release.

Modified: trunk/packages/numerix/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-ocaml-maint/trunk/packages/numerix/trunk/debian/rules?rev=2891&op=diff
==============================================================================
--- trunk/packages/numerix/trunk/debian/rules (original)
+++ trunk/packages/numerix/trunk/debian/rules Sun Jul  9 16:49:00 2006
@@ -16,6 +16,13 @@
 
 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
+
 
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
@@ -42,8 +49,7 @@
 
 	cp /usr/share/misc/config.guess /usr/share/misc/config.sub config
 
-	./configure --prefix=/usr --host=$(DEB_HOST_GNU_TYPE) \
-	            --build=$(DEB_BUILD_GNU_TYPE) \
+	./configure --prefix=/usr $(confflags) \
 	            --disable-sse2 --enable-ocaml_bignum --enable-gmp
 
 	touch config-stamp