[debhelper-devel] [debhelper] 01/01: dh_auto_configure: Expand ${prefix} uses

Niels Thykier nthykier at moszumanska.debian.org
Thu Jul 27 05:32:14 UTC 2017


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

nthykier pushed a commit to branch master
in repository debhelper.

commit eb6e510ef52430c6edb96b28879fa4f64fbcafdb
Author: Isaac Jurado <diptongo at gmail.com>
Date:   Sat Jan 30 18:26:53 2016 +0100

    dh_auto_configure: Expand ${prefix} uses
    
    Some configure scripts look like generated by autoconf (e.g. MakeKit) but don't
    behave exactly the same when expanding the install paths.  For example, when
    dh_auto_configure uses "--includedir=${prefix}/include", the "${prefix}" part is
    NOT always re-evaluated and, thus, expanded to "/usr".
    
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Buildsystem/autoconf.pm | 17 +++++++++--------
 debian/changelog                         |  5 +++++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/Debian/Debhelper/Buildsystem/autoconf.pm b/Debian/Debhelper/Buildsystem/autoconf.pm
index e31951b..b542584 100644
--- a/Debian/Debhelper/Buildsystem/autoconf.pm
+++ b/Debian/Debhelper/Buildsystem/autoconf.pm
@@ -31,11 +31,12 @@ sub configure {
 
 	# Standard set of options for configure.
 	my @opts;
+	my $prefix="/usr";
 	push @opts, "--build=" . dpkg_architecture_value("DEB_BUILD_GNU_TYPE");
-	push @opts, "--prefix=/usr";
-	push @opts, "--includedir=\${prefix}/include";
-	push @opts, "--mandir=\${prefix}/share/man";
-	push @opts, "--infodir=\${prefix}/share/info";
+	push @opts, "--prefix=$prefix";
+	push @opts, "--includedir=$prefix/include";
+	push @opts, "--mandir=$prefix/share/man";
+	push @opts, "--infodir=$prefix/share/info";
 	push @opts, "--sysconfdir=/etc";
 	push @opts, "--localstatedir=/var";
 	if (defined $ENV{DH_QUIET} && $ENV{DH_QUIET} ne "") {
@@ -46,15 +47,15 @@ sub configure {
 	my $multiarch=dpkg_architecture_value("DEB_HOST_MULTIARCH");
 	if (! compat(8)) {
 		if (defined $multiarch) {
-			push @opts, "--libdir=\${prefix}/lib/$multiarch";
-			push @opts, "--libexecdir=\${prefix}/lib/$multiarch";
+			push @opts, "--libdir=${prefix}/lib/$multiarch";
+			push @opts, "--libexecdir=${prefix}/lib/$multiarch";
 		}
 		else {
-			push @opts, "--libexecdir=\${prefix}/lib";
+			push @opts, "--libexecdir=${prefix}/lib";
 		}
 	}
 	else {
-		push @opts, "--libexecdir=\${prefix}/lib/" . sourcepackage();
+		push @opts, "--libexecdir=${prefix}/lib/" . sourcepackage();
 	}
 	push @opts, "--runstatedir=/run" if not compat(10);
 	push @opts, "--disable-maintainer-mode";
diff --git a/debian/changelog b/debian/changelog
index f001f62..c7d5c5f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -62,6 +62,11 @@ debhelper (10.7) UNRELEASED; urgency=medium
     not to be used correctly.  Use the /g flag so that all instances of the
     substitution variable are handled.  (Closes: #869780)
 
+  [ Isaac Jurado ]
+  * Make the autoconf buildsystem expand "${var}" values send to configure
+    (e.g. pass --mandir=/usr/share/man instead of --mandir=${prefix}/share/man).
+    (Closes: #813266)
+
  -- Niels Thykier <niels at thykier.net>  Sat, 15 Jul 2017 09:42:32 +0000
 
 debhelper (10.6.4) unstable; urgency=medium

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




More information about the debhelper-devel mailing list