[dpkg] 12/192: build: Use libexec variable for auxiliary internal programs

[Ximin Luo]

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

infinity0 pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit 747f3df99aa0263ba684c6ce317310b0c75f72c8
Author: Guillem Jover <guillem at debian.org>
Date:   Mon Mar 6 22:28:45 2017 +0100

    build: Use libexec variable for auxiliary internal programs
    
    Using libdir is wrong, and doubly so when being referred from
    architecture independent files such as perl modules. This affects
    non-Debian based systems, which might by default use an arch varying
    libdir per architecture, for example when using the obsolete multilib
    layout.
---
 debian/changelog            | 3 +++
 debian/rules                | 1 +
 dselect/Makefile.am         | 3 ++-
 dselect/methods/Makefile.am | 2 +-
 man/Makefile.am             | 2 +-
 scripts/Makefile.am         | 2 +-
 6 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 81448f0..fc96168 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,9 @@ dpkg (1.18.24) UNRELEASED; urgency=medium
     - Many spelling fixes. Thanks to Josh Soref <jsoref at gmail.com>.
     - Do not include mispellings in changelogs, as that makes detecting them
       more difficult.
+  * Build system:
+    - Use libexec variable for auxiliary internal programs, and set it to
+      /usr/lib on Debian and derivatives.
 
   [ Updated programs translations ]
   * Catalan (Guillem Jover).
diff --git a/debian/rules b/debian/rules
index 2e92d8a..6e0115e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,6 +65,7 @@ build-tree/config.status: configure
 		--sysconfdir=/etc \
 		--sbindir=/sbin \
 		--localstatedir=/var \
+		--libexecdir=\$${exec_prefix}/lib \
 		--with-devlibdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		--without-libmd \
 		--with-libz \
diff --git a/dselect/Makefile.am b/dselect/Makefile.am
index 3c0817c..9206603 100644
--- a/dselect/Makefile.am
+++ b/dselect/Makefile.am
@@ -7,7 +7,8 @@ pkgconfdir = $(sysconfdir)/@PACKAGE@
 
 AM_CPPFLAGS = \
 	-DLOCALEDIR=\"$(localedir)\" \
-	-DADMINDIR=\"$(admindir)\" -DLIBDIR=\"$(pkglibdir)\" \
+	-DADMINDIR=\"$(admindir)\" \
+	-DLIBDIR=\"$(pkglibexecdir)\" \
 	-DLOCALLIBDIR=\"/usr/local/lib/dpkg\" \
 	-idirafter $(top_srcdir)/lib/compat \
 	-iquote $(builddir) \
diff --git a/dselect/methods/Makefile.am b/dselect/methods/Makefile.am
index 5a0c97a..3a2c3be 100644
--- a/dselect/methods/Makefile.am
+++ b/dselect/methods/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-methodsdir = $(pkglibdir)/methods
+methodsdir = $(pkglibexecdir)/methods
 
 nobase_dist_methods_DATA = \
 	disk/names \
diff --git a/man/Makefile.am b/man/Makefile.am
index e5f3c54..550078d 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -205,7 +205,7 @@ MANGEN = $(MANGEN_V) sed \
 	-e 's:%ADMINDIR%:$(admindir):g' \
 	-e 's:%PKGDOCDIR%:$(docdir):g' \
 	-e 's:%PKGCONFDIR%:$(pkgconfdir):g' \
-	-e 's:%PKGLIBDIR%:$(pkglibdir):g' \
+	-e 's:%PKGLIBDIR%:$(pkglibexecdir):g' \
 	-e 's:%PKGDATADIR%:$(pkgdatadir):g'
 	$(nil)
 
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 5583fa9..435f0c5 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -128,7 +128,7 @@ do_perl_subst = $(AM_V_GEN) sed \
 	-e "s:^\#![[:space:]]*/usr/bin/perl:\#!$(PERL):" \
 	-e "s:our \$$CONFDIR = .*;:our \$$CONFDIR = '$(pkgconfdir)';:" \
 	-e "s:our \$$ADMINDIR = .*;:our \$$ADMINDIR = '$(admindir)';:" \
-	-e "s:our \$$LIBDIR = .*;:our \$$LIBDIR = '$(pkglibdir)';:" \
+	-e "s:our \$$LIBDIR = .*;:our \$$LIBDIR = '$(pkglibexecdir)';:" \
 	-e "s:our \$$DATADIR = .*;:our \$$DATADIR = '$(pkgdatadir)';:" \
 	-e "s:our \$$PROGMAKE = .*;:our \$$PROGMAKE = '$(MAKE)';:" \
 	-e "s:our \$$PROGTAR = .*;:our \$$PROGTAR = '$(TAR)';:" \

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