The following commit has been merged in the master branch:
commit 81d048b4ccdfe129a562a96be2a00472cbe46c77
Author: Guillem Jover <[email protected]>
Date: Fri Mar 29 20:13:01 2013 +0100
dpkg-architecture(1): Fix debian/rules usage documentation
Only set the configure flags if they have not been previously set.
Call the configure script with a path prefix. Pass --build/--host or
--build to configure depending on whether we are cross-compiling.
diff --git a/debian/changelog b/debian/changelog
index 7ec13a0..35ffbd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -24,6 +24,7 @@ dpkg (1.17.0) UNRELEASED; urgency=low
- Unify command-line options into a single OPTIONS section.
- Mark programs, variables, fields and command-line options in bold.
- Fold dpkg-architecture(1) DEBIAN/RULES section into EXAMPLES.
+ - Fix dpkg-architecture(1) debian/rules usage documentation.
* Use colon instead of dot for user:group in dpkg debug output.
* Remove support for obsolete DM-Upload-Allowed from Dpkg::Vendor::Debian.
* Fix update-alternatives to use the current alternative link as the first
diff --git a/man/dpkg-architecture.1 b/man/dpkg-architecture.1
index eabe53c..a9a0a48 100644
--- a/man/dpkg-architecture.1
+++ b/man/dpkg-architecture.1
@@ -215,10 +215,17 @@ Retrieving the GNU system type and forwarding it to
./configure:
.PP
.RS 4
.nf
-DEB_BUILD_GNU_TYPE := $(shell dpkg\-architecture \-qDEB_BUILD_GNU_TYPE)
-DEB_HOST_GNU_TYPE := $(shell dpkg\-architecture \-qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg\-architecture \-qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE ?= $(shell dpkg\-architecture \-qDEB_HOST_GNU_TYPE)
[...]
-configure \-\-build=$(DEB_BUILD_GNU_TYPE) \-\-host=$(DEB_HOST_GNU_TYPE)
+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
+[...]
+\&./configure $(confflags)
.fi
.RE
.PP
@@ -226,7 +233,7 @@ Doing something only for a specific architecture:
.PP
.RS 4
.nf
-DEB_HOST_ARCH := $(shell dpkg\-architecture \-qDEB_HOST_ARCH)
+DEB_HOST_ARCH ?= $(shell dpkg\-architecture \-qDEB_HOST_ARCH)
ifeq ($(DEB_HOST_ARCH),alpha)
[...]
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
