[debhelper-devel] [debhelper] 01/01: autoconf.pm: Pass --runstatedir=/run in compat 11

Niels Thykier nthykier at moszumanska.debian.org
Wed Apr 12 08:23:51 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 ea1b656f937c60f0d06d5272c149cb873b7d8ac6
Author: Niels Thykier <niels at thykier.net>
Date:   Wed Apr 12 08:21:43 2017 +0000

    autoconf.pm: Pass --runstatedir=/run in compat 11
    
    Suggested-by: Michael Biebl <biebl at debian.org>
    Signed-off-by: Niels Thykier <niels at thykier.net>
---
 Debian/Debhelper/Buildsystem/autoconf.pm | 3 ++-
 debhelper.pod                            | 5 +++++
 debian/changelog                         | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Debian/Debhelper/Buildsystem/autoconf.pm b/Debian/Debhelper/Buildsystem/autoconf.pm
index ec3a9f7..2665065 100644
--- a/Debian/Debhelper/Buildsystem/autoconf.pm
+++ b/Debian/Debhelper/Buildsystem/autoconf.pm
@@ -45,7 +45,7 @@ sub configure {
 	}
 	my $multiarch=dpkg_architecture_value("DEB_HOST_MULTIARCH");
 	if (! compat(8)) {
-	       if (defined $multiarch) {
+		if (defined $multiarch) {
 			push @opts, "--libdir=\${prefix}/lib/$multiarch";
 			push @opts, "--libexecdir=\${prefix}/lib/$multiarch";
 		}
@@ -56,6 +56,7 @@ sub configure {
 	else {
 		push @opts, "--libexecdir=\${prefix}/lib/" . sourcepackage();
 	}
+	push @opts, "--runstatedir=/run" if not compat(10);
 	push @opts, "--disable-maintainer-mode";
 	push @opts, "--disable-dependency-tracking";
 	# Provide --host only if different from --build, as recommended in
diff --git a/debhelper.pod b/debhelper.pod
index b8e02a2..89eb634 100644
--- a/debhelper.pod
+++ b/debhelper.pod
@@ -649,6 +649,11 @@ which can also see the files installed by other helpers.
 The B<--no-restart-on-upgrade> option in dh_installinit has been removed.
 Please use the new name B<--no-stop-on-upgrade>
 
+=item -
+
+The B<autoconf> buildsystem now passes B<--runstatedir=/run> to
+F<./configure>.
+
 =back
 
 =back
diff --git a/debian/changelog b/debian/changelog
index 6504ed4..06d360d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -32,6 +32,8 @@ debhelper (10.3) UNRELEASED; urgency=medium
   * dh_systemd_enable.1: Clarify that --no-enable does not control
     whether a service is started and that dh_systemd_start is the tool
     that does that.  (Closes: #770281)
+  * autoconf.pm: Set --runstatedir to "/run" in compat 11.  Thanks to
+    Michael Biebl for the suggestion.
 
   [ Steven Chamberlain ]
   * When cross-compiling for GNU/kFreeBSD host systems, set

-- 
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