[Pkg-lyx-devel] svn commit: r207 - in /lyx/trunk/debian: changelog rules

[pelle at users.alioth.debian.org]

Author: pelle
Date: Wed Oct 25 17:10:02 2006
New Revision: 207

URL: http://svn.debian.org/wsvn/pkg-lyx/?sc=1&rev=207
Log:
* Only give both --build and --host to ./configure if cross-compiling.

Modified:
    lyx/trunk/debian/changelog
    lyx/trunk/debian/rules

Modified: lyx/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/changelog?rev=207&op=diff
==============================================================================
--- lyx/trunk/debian/changelog (original)
+++ lyx/trunk/debian/changelog Wed Oct 25 17:10:02 2006
@@ -8,6 +8,7 @@
   
   [ Per Olofsson ]
   * Added -Wl,--as-needed to LDFLAGS.
+  * Only give both --build and --host to ./configure if cross-compiling.
   
  -- Per Olofsson <pelle at debian.org>  Wed, 25 Oct 2006 19:03:51 +0200
 

Modified: lyx/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-lyx/lyx/trunk/debian/rules?rev=207&op=diff
==============================================================================
--- lyx/trunk/debian/rules (original)
+++ lyx/trunk/debian/rules Wed Oct 25 17:10:02 2006
@@ -11,9 +11,14 @@
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_ARCH       ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
-CONFIGURE_OPTIONS = \
-	--host=$(DEB_HOST_GNU_TYPE) \
-	--build=$(DEB_BUILD_GNU_TYPE) \
+ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+	CONFIGURE_OPTIONS += --build $(DEB_HOST_GNU_TYPE)
+else
+	CONFIGURE_OPTIONS += --build $(DEB_BUILD_GNU_TYPE) \
+		--host $(DEB_HOST_GNU_TYPE)
+endif
+
+CONFIGURE_OPTIONS += \
 	--prefix=/usr \
 	--infodir=/usr/share/info \
 	--mandir=/usr/share/man \