aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Blunck <jblunck@brocade.com>2017-03-14 20:58:24 +0100
committerLuca Boccassi <luca.boccassi@gmail.com>2017-03-15 15:53:37 +0000
commit84adab31e2d11153f8f83eafc4cc54af5deb7806 (patch)
tree412dba2adc01cab7a224e5cd93b4f1d28c783ad6
parentf526ca8bf77507daef96061932352e35ab607758 (diff)
Fix pkg-config multiarch libdir
Change-Id: Ie619ee1992fd6d9d41e0b427707a825658c4dfc9 Signed-off-by: Jan Blunck <jblunck@infradead.org> Signed-off-by: Luca Boccassi <luca.boccassi@gmail.com>
-rw-r--r--debian/libdpdk.pc.in2
-rwxr-xr-xdebian/rules1
2 files changed, 2 insertions, 1 deletions
diff --git a/debian/libdpdk.pc.in b/debian/libdpdk.pc.in
index eff4f18e..fbd14aee 100644
--- a/debian/libdpdk.pc.in
+++ b/debian/libdpdk.pc.in
@@ -1,6 +1,6 @@
prefix=/usr
exec_prefix=${prefix}
-libdir=${prefix}/lib
+libdir=@LIBDIR@
includedir=${prefix}/include
Name: dpdk
diff --git a/debian/rules b/debian/rules
index 1fc7bbdb..2b7db757 100755
--- a/debian/rules
+++ b/debian/rules
@@ -258,6 +258,7 @@ override_dh_auto_install-arch:
LIBS=$$(sed -e 's/GROUP ( \(.*\) )/\1/' -e 's/lib/-l/g' -e 's/\.so//g' \
$(CURDIR)/debian/libdpdk-dev/$(LIBDIR)/libdpdk.so); \
sed -e "s/@DPDK_LIBS@/$${LIBS}/" -e "s/@VERSION@/$(VERSION)/" \
+ -e "s|@LIBDIR@|$(LIBDIR)|" \
debian/libdpdk.pc.in > debian/libdpdk-dev/$(LIBDIR)/pkgconfig/libdpdk.pc
# Package: dpdk-igb-uio-dkms
mkdir -p debian/dpdk-igb-uio-dkms/usr/src/dpdk-igb-uio-$(VERSION)