diff options
| author | Niels Thykier <niels@thykier.net> | 2017-07-31 18:58:02 +0000 |
|---|---|---|
| committer | Niels Thykier <niels@thykier.net> | 2017-07-31 18:58:41 +0000 |
| commit | c6142ba93b5c987801b1aa2860710c0a1354cbd4 (patch) | |
| tree | 3529ec79e8417151c6c55e75a4f2d483d9c61133 | |
| parent | 76231df3b32e3cdf4155e99c19ca4af7b59eb09c (diff) | |
| download | debhelper-c6142ba93b5c987801b1aa2860710c0a1354cbd4.tar.gz | |
Revert "dh_auto_configure: Expand ${prefix} uses"
This reverts commit eb6e510ef52430c6edb96b28879fa4f64fbcafdb.
| -rw-r--r-- | Debian/Debhelper/Buildsystem/autoconf.pm | 17 | ||||
| -rw-r--r-- | debian/changelog | 4 |
2 files changed, 12 insertions, 9 deletions
diff --git a/Debian/Debhelper/Buildsystem/autoconf.pm b/Debian/Debhelper/Buildsystem/autoconf.pm index b5425848..e31951b0 100644 --- a/Debian/Debhelper/Buildsystem/autoconf.pm +++ b/Debian/Debhelper/Buildsystem/autoconf.pm @@ -31,12 +31,11 @@ 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=$prefix"; - push @opts, "--includedir=$prefix/include"; - push @opts, "--mandir=$prefix/share/man"; - push @opts, "--infodir=$prefix/share/info"; + push @opts, "--prefix=/usr"; + 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 "") { @@ -47,15 +46,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 c796ed94..d39fc9c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,10 @@ debhelper (10.7.1) UNRELEASED; urgency=medium (like the documentation promises). * dh: Ensure that we do not fork a shell for running a simple command. + * autoconf: Revert expansion of ${var} variables passed to + configure as several packages implicitly assume that are not + expanded. E.g. liblockfile relies on ${prefix} being + unexpanded for DESTDIR to work. Reopens: #813266 -- Niels Thykier <niels@thykier.net> Sun, 30 Jul 2017 10:27:46 +0000 |