X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=debian%2Frules;h=ca23621d94f4f548a05a9cd5b0ebefdf8476d69f;hp=99bed261089aba209d2179a5b777ba6688246e1c;hb=b951314c220cb477ce7d1afc07c2213962304f52;hpb=76cc80f42e53215b9039ca99dd35687c7518880a

diff --git a/debian/rules b/debian/rules
index 99bed2610..ca23621d9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,35 @@
 #! /usr/bin/make -f
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+# The options have been chooses as follows:
+# - manually set pamlibdir because we'Re installing in /usr by default but 
+#   pam libs must go to /lib/*/security
+# - Disable lto because this makes the build fail with static library 
+#   warnings and with  linking errors. (It seems taht instead of ar/ld 
+#   gcc-ar and gcc should be used)
+# - tests disabled beacuase some of the tests seem to require elogind running.
+#   Need to sort out which tests could be run
 
-# 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
 CONFFLAGS = \
-  --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
-  --enable-kdbus \
+  --with-pamlibdir=/lib/$(DEB_HOST_MULTIARCH)/security \
+  --with-udevrulesdir=/lib/udev/rules.d \
   --disable-lto \
   --disable-tests
 
-autoreconf:
-	./autogen.sh
-	
+CONFFLAGS_CGROUPCTRL_ELOGIND= \
+  --with-cgroup-controller=elogind
+
 override_dh_autoreconf:
-	dh_autoreconf debian/rules -- autoreconf
+	dh_autoreconf ./autogen.sh
 
 override_dh_auto_configure:
 	dh_auto_configure --builddirectory=build \
-    -- $(CONFFLAGS)
+    -- $(CONFFLAGS) $(CONFFLAGS_CGROUPCTRL_ELOGIND)
+
+override_dh_missing:
+	dh_missing --list-missing
+
+override_dh_shlibdeps:
+	dh_shlibdeps -- -xlibeudev1
 
 %:
 	dh $@ --builddirectory=build --with autoreconf --parallel