* debian/rules:

  - correctly enable pie and bindnow.
  - use a variable for multi-arch path instead of *.

git-svn-id: svn://anonscm.debian.org/pkg-xfce/goodies/trunk/lightdm@6070 0c9b3bff-18ee-0310-b944-d1aa2700132f

diff --git a/debian/changelog b/debian/changelog
index 75003cdc90cfd22f33695374b3cb18ba6ea2c5f2..2a4ffbd4a8f3e55e0f13c778139eba17d8cc705b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+lightdm (1.0.0-2) UNRELEASED; urgency=low
+
+  * debian/rules:
+    - correctly enable pie and bindnow.
+    - use a variable for multi-arch path instead of *.
+
+ -- Yves-Alexis Perez <corsac@debian.org>  Thu, 29 Sep 2011 10:52:54 +0200
+
 lightdm (1.0.0-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/debian/rules b/debian/rules
index 68de60ca4514d5f690569b9cdab191160a4045ed..a2b4a71eae4bd2083453d262059985eac110fc14 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,9 @@
 #!/usr/bin/make -f
 
 export DEB_LDFLAGS_MAINT_APPEND=-Wl,--as-needed -Wl,-O1
-export DEB_BUILD_MAINT_OPTIONS="hardening=+pie,+bindnow"
+export DEB_BUILD_MAINT_OPTIONS=hardening=+pie,+bindnow
+
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 override_dh_auto_configure:
        dh_auto_configure -- --with-greeter-user=lightdm --with-user-session=lightdm-xsession
@@ -11,7 +13,7 @@ override_dh_installinit:
 
 override_dh_install:
        find debian/tmp -name '*.la' -delete
-       rm debian/tmp/usr/lib/*/lightdm/gdmflexiserver
+       rm debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/lightdm/gdmflexiserver
        dh_install --fail-missing
 
 %: