From: Andreas Messer <andi@bastelmap.de>
Date: Thu, 4 Jan 2018 22:05:59 +0000 (+0100)
Subject: Fix install locations
X-Git-Tag: chiark/234.4-1+devuan1.1+iwj1~28
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=be8240e31a27c4354175117fd5550b26e41bd46c

Fix install locations
---

diff --git a/debian/elogind.install b/debian/elogind.install
index 39c7e9b00..d405bcef3 100644
--- a/debian/elogind.install
+++ b/debian/elogind.install
@@ -1,18 +1,18 @@
+bin/loginctl
+bin/elogind-inhibit
 etc/elogind/logind.conf
 etc/pam.d/elogind-user
+lib/elogind/elogind
+lib/elogind/elogind-cgroups-agent
 lib/udev/rules.d/*.rules
-usr/bin/loginctl
-usr/bin/elogind-inhibit
-usr/lib/elogind/elogind
-usr/lib/elogind/elogind-cgroups-agent
-usr/share/polkit-1/*
 usr/share/bash-completion/*
+usr/share/dbus-1/*
+usr/share/doc/elogind/*
+usr/share/factory/*
 usr/share/man/man1/loginctl.1
 usr/share/man/man5/logind.conf.5
 usr/share/man/man7/elogind.*.7
 usr/share/man/man8/pam_elogind.8
 usr/share/man/man8/elogind.8
+usr/share/polkit-1/*
 usr/share/zsh/*
-usr/share/doc/elogind/*
-usr/share/dbus-1/*
-usr/share/factory/*
diff --git a/debian/libelogind-dev.install b/debian/libelogind-dev.install
index 3665adf61..70f3e5bf3 100644
--- a/debian/libelogind-dev.install
+++ b/debian/libelogind-dev.install
@@ -1,6 +1,6 @@
 usr/lib/*/pkgconfig/libelogind.pc
-usr/lib/*/security/pam_elogind.la
-usr/lib/*/libelogind.la
-usr/share/man/man3/*
+lib/*/security/pam_elogind.la
+lib/*/libelogind.la
 usr/include/elogind/*
 usr/include/elogind/systemd/*
+usr/share/man/man3/*
diff --git a/debian/libelogind.install b/debian/libelogind.install
index ed9f10199..62e19c2ba 100644
--- a/debian/libelogind.install
+++ b/debian/libelogind.install
@@ -1,2 +1,2 @@
-usr/lib/*/libelogind.so.*
-usr/lib/*/security/pam_elogind.so
+lib/*/libelogind.so.*
+lib/*/security/pam_elogind.so
diff --git a/debian/rules b/debian/rules
index 99bed2610..1207d9174 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,8 +4,11 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 # disable lto because this does not work for me. Building static libraries with i
 # libtool/ar failes. I think this a apackage problem, it should use gcc-ar instead
+# also some of the tests fail
 CONFFLAGS = \
-  --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+  --exec-prefix= \
+  --with-rootprefix= \
+  --with-rootlibdir=/lib/$(DEB_HOST_MULTIARCH) \
   --enable-kdbus \
   --disable-lto \
   --disable-tests