[Pkg-utopia-commits] r2126 - in /packages/unstable/dbus-python/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Mon Mar 10 18:12:18 2008
New Revision: 2126

URL: http://svn.debian.org/wsvn/pkg-utopia/?sc=1&rev=2126
Log:
Only pass --host to configure if DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE
  differ.

Modified:
    packages/unstable/dbus-python/debian/changelog
    packages/unstable/dbus-python/debian/rules

Modified: packages/unstable/dbus-python/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus-python/debian/changelog?rev=2126&op=diff
==============================================================================
--- packages/unstable/dbus-python/debian/changelog (original)
+++ packages/unstable/dbus-python/debian/changelog Mon Mar 10 18:12:18 2008
@@ -1,7 +1,9 @@
-dbus-python (0.82.4-2) UNRELEASED; urgency=low
+dbus-python (0.82.4-2) unstable; urgency=low
 
   * Drop python-xml-dbg dep; closes: #470355.
   * Drop python-dbus-dbg.linda-overrides as linda is no more.
+  * Only pass --host to configure if DEB_HOST_GNU_TYPE and DEB_BUILD_GNU_TYPE
+    differ.
 
  -- Loic Minier <lool at dooz.org>  Mon, 10 Mar 2008 19:03:37 +0100
 

Modified: packages/unstable/dbus-python/debian/rules
URL: http://svn.debian.org/wsvn/pkg-utopia/packages/unstable/dbus-python/debian/rules?rev=2126&op=diff
==============================================================================
--- packages/unstable/dbus-python/debian/rules (original)
+++ packages/unstable/dbus-python/debian/rules Mon Mar 10 18:12:18 2008
@@ -17,6 +17,16 @@
 PYVERS := $(shell pyversions --requested --version debian/control)
 PYDEFAULTVER := $(shell pyversions --default --version)
 
+ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+	CONFIGURE_FLAGS += --build=$(DEB_BUILD_GNU_TYPE)
+else
+	CONFIGURE_FLAGS += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
+endif
+
+CONFIGURE_FLAGS += \
+	--prefix=/usr \
+	--docdir=/usr/share/doc/deleteme
+
 build-%/configure-stamp:
 	dh_testdir
 	mkdir -p build-$*
@@ -26,10 +36,7 @@
 			export CFLAGS; \
 			;; \
 	esac; \
-	cd build-$* && PYTHON=/usr/bin/python$* \
-		../configure --host=$(DEB_HOST_GNU_TYPE) \
-			--build=$(DEB_BUILD_GNU_TYPE) \
-			--prefix=/usr --docdir=/usr/share/doc/deleteme
+	cd build-$* && PYTHON=/usr/bin/python$* ../configure $(CONFIGURE_FLAGS)
 	touch $@
 
 build-%/build-stamp: build-%/configure-stamp