[mig] 01/01: set triplets only when cross-building, otherwise configure owuld rename mig

[Samuel Thibault]

This is an automated email from the git hooks/post-receive script.

sthibault pushed a commit to branch master
in repository mig.

commit ca2de47a9b774c47ae5ba47f2281edea7ace0c01
Author: Samuel Thibault <address@hidden>
Date:   Fri Aug 28 13:39:37 2015 +0000

    set triplets only when cross-building, otherwise configure owuld rename mig
---
 debian/changelog |  2 +-
 debian/rules     | 16 +++++++++-------
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3ac7780..4762b81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ mig (1.5-2) UNRELEASED; urgency=medium
   * rules, control: Support building a cross-compiling mig.
   * rules: Bump dpkg-dev build-dep version to get target triplet.
 
- -- Samuel Thibault <address@hidden>  Tue, 18 Aug 2015 13:38:26 +0200
+ -- Samuel Thibault <address@hidden>  Fri, 28 Aug 2015 13:27:00 +0000
 
 mig (1.5-1) unstable; urgency=medium
 
diff --git a/debian/rules b/debian/rules
index 0ee578d..7f3e21f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,16 +17,13 @@ DEB_TARGET_GNU_TYPE := $(shell dpkg-architecture 
-qDEB_TARGET_GNU_TYPE)
 %:
        dh $@ -Bbuild --with autoreconf
 
-override_dh_auto_configure:
-       dh_auto_configure -Bbuild -- \
-         --libexecdir=/usr/lib/mig/ \
-         --build=$(DEB_BUILD_GNU_TYPE) \
-         --host=$(DEB_HOST_GNU_TYPE) \
-         --target=$(DEB_TARGET_GNU_TYPE)
-
 ifeq ($(DEB_HOST_GNU_TYPE),$(DEB_TARGET_GNU_TYPE))
 ARCH=any-i386
 else
+CONFIGURE_OPTIONS = \
+         --build=$(DEB_BUILD_GNU_TYPE) \
+         --host=$(DEB_HOST_GNU_TYPE) \
+         --target=$(DEB_TARGET_GNU_TYPE)
 CROSS=-$(DEB_TARGET_GNU_TYPE)
 CROSSDEP=:$(DEB_TARGET_ARCH)
 ARCH=$(DEB_HOST_ARCH)
@@ -44,6 +41,11 @@ ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_TARGET_GNU_TYPE))
 endif
        touch $@
 
+override_dh_auto_configure:
+       dh_auto_configure -Bbuild -- \
+         --libexecdir=/usr/lib/mig/ \
+         $(CONFIGURE_OPTIONS)
+
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_TARGET_GNU_TYPE))
 build-arch: debian/control.stamp
 build-indep:

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-hurd/mig.git