* Use a better way of passing the system type to configure.

diff --git a/debian/changelog b/debian/changelog
index 73d5e8e3e874911e393c5e3e71a1b018a24c8b52..799ba63f7b07d47332f9bf72b428ae2c84eb2aeb 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+sident (3.6-2) unstable; urgency=low
+
+  * Use a better way of passing the system type to configure.
+
+ --
+
 sident (3.6-1) unstable; urgency=low
 
   * New upstream version.

diff --git a/debian/rules b/debian/rules
index 6843a6206c62a0311b1835234dac3fb3272e93c4..bcfb7bdfd41b095d965ef163a005ddff8885321c 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -6,10 +6,14 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# These are used for cross-compiling and for saving the configure script
-# 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)
+# Tell Autoconf the correct system types.
+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))
+    SYSTEM = --build $(DEB_HOST_GNU_TYPE)
+else
+    SYSTEM = --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+endif
 
 CFLAGS = -Wall -g
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -20,10 +24,8 @@ endif
 
 config.status: configure
        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 \
-           --enable-reduced-depends
+       CFLAGS="$(CFLAGS)" ./configure $(SYSTEM) --prefix=/usr \
+           --mandir=\$${prefix}/share/man --enable-reduced-depends
 
 build: build-arch build-indep
 build-arch: build-stamp