r737 - in /unstable/libmms/debian: changelog rules

[lool at users.alioth.debian.org]

Author: lool
Date: Fri Mar 30 09:39:45 2007
New Revision: 737

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=737
Log:
* Don't pass --host to configure if DEB_BUILD_GNU_TYPE equals
  DEB_HOST_GNU_TYPE.

Modified:
    unstable/libmms/debian/changelog
    unstable/libmms/debian/rules

Modified: unstable/libmms/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libmms/debian/changelog?rev=737&op=diff
==============================================================================
--- unstable/libmms/debian/changelog (original)
+++ unstable/libmms/debian/changelog Fri Mar 30 09:39:45 2007
@@ -1,8 +1,10 @@
 libmms (0.3-3) UNRELEASED; urgency=low
 
   * Set Maintainer to pkg-multimedia-maintainers and list myself as Uploader.
+  * Don't pass --host to configure if DEB_BUILD_GNU_TYPE equals
+    DEB_HOST_GNU_TYPE.
 
- -- Loic Minier <lool at dooz.org>  Fri, 30 Mar 2007 11:37:32 +0200
+ -- Loic Minier <lool at dooz.org>  Fri, 30 Mar 2007 11:39:23 +0200
 
 libmms (0.3-2) unstable; urgency=low
 

Modified: unstable/libmms/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/libmms/debian/rules?rev=737&op=diff
==============================================================================
--- unstable/libmms/debian/rules (original)
+++ unstable/libmms/debian/rules Fri Mar 30 09:39:45 2007
@@ -7,6 +7,16 @@
 # from having to guess our platform (since we know it already)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+
+confflags += --prefix=/usr \
+	--mandir=\$${prefix}/share/man \
+	--infodir=\$${prefix}/share/info
+
+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
 
 PATCH_DIR := debian/patches
 
@@ -20,7 +30,7 @@
 
 config.status: configure patch-stamp
 	dh_testdir
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	CFLAGS="$(CFLAGS)" ./configure $(confflags)
 
 patch-stamp:
 	dh_testdir