[master] 27fb74b Use multiarch-ignorant library (vmod) placement.

[Lasse Karstensen]

commit 27fb74bb1eac169a93b7e21ae68a7bb4f1d5c9fd
Author: Lasse Karstensen <lkarsten at varnish-software.com>
Date:   Mon Feb 23 20:17:23 2015 +0100

    Use multiarch-ignorant library (vmod) placement.
    
    Fixes: #1679

diff --git a/libvarnishapi-dev.install b/libvarnishapi-dev.install
index f4466f5..dcfb93e 100644
--- a/libvarnishapi-dev.install
+++ b/libvarnishapi-dev.install
@@ -1,5 +1,5 @@
 usr/include/varnish
 usr/share/aclocal
 usr/share/varnish/vmodtool.py
-/usr/lib/*/libvarnishapi.so
-/usr/lib/*/pkgconfig/*.pc
+/usr/lib/libvarnishapi.so
+/usr/lib/pkgconfig/*.pc
diff --git a/libvarnishapi1.install b/libvarnishapi1.install
index d6a64d3..eeaf559 100644
--- a/libvarnishapi1.install
+++ b/libvarnishapi1.install
@@ -1 +1 @@
-/usr/lib/*/lib*.so.*
+/usr/lib/lib*.so.*
diff --git a/rules b/rules
index 386a809..1b6f800 100755
--- a/rules
+++ b/rules
@@ -11,7 +11,7 @@ DISABLE_JEMALLOC_ARCH_LIST := hppa m68k
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 
 # Set local state dir for FHS
-LOCAL_CONFIGURE_FLAGS = --localstatedir=/var/lib
+LOCAL_CONFIGURE_FLAGS = --localstatedir=/var/lib --libdir=/usr/lib
 
 ifneq ($(filter $(DEB_HOST_ARCH),$(DISABLE_JEMALLOC_ARCH_LIST)),)
 LOCAL_CONFIGURE_FLAGS += --disable-jemalloc
diff --git a/varnish.install b/varnish.install
index 580430d..7b3521e 100644
--- a/varnish.install
+++ b/varnish.install
@@ -1,7 +1,7 @@
 etc/varnish/default.vcl
 usr/bin/*
 usr/sbin/*
-/usr/lib/*/varnish
+/usr/lib/varnish
 usr/share/man
 debian/*.service lib/systemd/system/
 usr/share/doc/varnish/*.vcl