From eae0b17537596dc5589598c4724feb14c5d7e949 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Mon, 14 Sep 2015 16:14:42 +0200
Subject: build: Add a new --with-devlibdir configure option

This will make it possible to use a different directory for the C libdpkg
files to the dselect methods and perl plugins directory.
---
 configure.ac           | 2 ++
 debian/changelog       | 2 ++
 lib/dpkg/Makefile.am   | 4 ++--
 lib/dpkg/libdpkg.pc.in | 2 +-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4559fd835..bb062c122 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,8 @@ DPKG_BUILD_PROG([start-stop-daemon])
 DPKG_BUILD_PROG([update-alternatives])
 
 # Allow alternate directories
+DPKG_WITH_DIR([devlibdir], [${libdir}],
+              [dpkg development library directory [LIBDIR]])
 DPKG_WITH_DIR([pkgconfdir], [${sysconfdir}/${PACKAGE_NAME}],
               [dpkg configuration directory [SYSCONFDIR/dpkg]])
 DPKG_WITH_DIR([admindir], [${localstatedir}/lib/${PACKAGE_NAME}],
diff --git a/debian/changelog b/debian/changelog
index 5269422e1..422bbea39 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,8 @@ dpkg (1.18.3) UNRELEASED; urgency=low
     - Get the reference build flags from dpkg-buildflags.pl, instead of
       hardcoding them, which might not match depending on the architecture.
       Closes: #794694
+  * Build system:
+    - Add a new --with-devlibdir configure option for the C libdpkg library.
   * Packaging:
     - Remove unneeded --sourcedir options from dh_install calls.
     - Do not change libdir to a multi-arch directory for the entire dpkg.
diff --git a/lib/dpkg/Makefile.am b/lib/dpkg/Makefile.am
index ad3b97120..3a75b3c12 100644
--- a/lib/dpkg/Makefile.am
+++ b/lib/dpkg/Makefile.am
@@ -18,10 +18,10 @@ EXTRA_DIST = \
 	libdpkg.map \
 	libdpkg.pc.in
 
-pkgconfigdir = $(libdir)/pkgconfig
+pkgconfigdir = $(devlibdir)/pkgconfig
 pkgconfig_DATA = libdpkg.pc
 
-lib_LTLIBRARIES = libdpkg.la
+devlib_LTLIBRARIES = libdpkg.la
 
 libdpkg_la_LDFLAGS =
 if HAVE_LINKER_VERSION_SCRIPT
diff --git a/lib/dpkg/libdpkg.pc.in b/lib/dpkg/libdpkg.pc.in
index 3adc2fd91..4409521a8 100644
--- a/lib/dpkg/libdpkg.pc.in
+++ b/lib/dpkg/libdpkg.pc.in
@@ -1,6 +1,6 @@
 prefix=@prefix@
 exec_prefix=@exec_prefix@
-libdir=@libdir@
+libdir=@devlibdir@
 includedir=@includedir@
 
 Name: libdpkg
-- 
cgit v1.2.3