r8472 - packages/trunk/warzone2100/debian

[Paul Wise]

Author: pabs
Date: 2008-12-03 16:02:01 +0000 (Wed, 03 Dec 2008)
New Revision: 8472

Modified:
   packages/trunk/warzone2100/debian/changelog
   packages/trunk/warzone2100/debian/rules
Log:
Improve the cross-build support slightly

Modified: packages/trunk/warzone2100/debian/changelog
===================================================================
--- packages/trunk/warzone2100/debian/changelog	2008-12-03 16:01:04 UTC (rev 8471)
+++ packages/trunk/warzone2100/debian/changelog	2008-12-03 16:02:01 UTC (rev 8472)
@@ -3,6 +3,7 @@
   * New upstream release candidate
   * Remove Linas Žvirblis from uploaders since he hasn't been
     heard from for a very long time.
+  * Improve the cross-build support slightly
 
  -- Paul Wise <pabs at debian.org>  Wed, 03 Dec 2008 21:57:30 +0900
 

Modified: packages/trunk/warzone2100/debian/rules
===================================================================
--- packages/trunk/warzone2100/debian/rules	2008-12-03 16:01:04 UTC (rev 8471)
+++ packages/trunk/warzone2100/debian/rules	2008-12-03 16:02:01 UTC (rev 8472)
@@ -5,6 +5,12 @@
 DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+	CROSS = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+	CROSS = --build $(DEB_BUILD_GNU_TYPE)
+endif
+
 SUBDIRS = $(shell sed -n 's/^ *SUBDIRS *= *\(.*\)/\1/;s/ po / /;s/ data / /p' Makefile.am)
 
 CFLAGS  = -Wall -g
@@ -34,8 +40,7 @@
 	./configure \
 	    CFLAGS="$(CFLAGS)" \
 	    LDFLAGS="$(LDFLAGS)" \
-	    --host=$(DEB_HOST_GNU_TYPE) \
-	    --build=$(DEB_BUILD_GNU_TYPE) \
+	    $(CROSS) \
 	    --prefix=/usr \
 	    --bindir=\$${prefix}/games \
 	    --datadir=\$${prefix}/share/games \