[Pkg-xfce-commits] r6410 - desktop/trunk/xfce4-session/debian

[Yves-Alexis Perez]

Author: corsac
Date: 2012-02-13 14:24:01 +0000 (Mon, 13 Feb 2012)
New Revision: 6410

Modified:
   desktop/trunk/xfce4-session/debian/rules
Log:
use $(DEB_HOST_MULTIARCH)


Modified: desktop/trunk/xfce4-session/debian/rules
===================================================================
--- desktop/trunk/xfce4-session/debian/rules	2012-02-12 20:41:59 UTC (rev 6409)
+++ desktop/trunk/xfce4-session/debian/rules	2012-02-13 14:24:01 UTC (rev 6410)
@@ -13,14 +13,14 @@
 	dh_auto_clean
 
 override_dh_install:
-	rm -f debian/tmp/usr/lib/*/xfce4/session/splash-engines/*.la
-	rm -f debian/tmp/usr/lib/*/*.la
-	rm -f debian/tmp/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.*a
+	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/session/splash-engines/*.la
+	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la
+	rm -f debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libxfsm-logout-plugin.*a
 	
 	chrpath -d -k debian/tmp/usr/bin/* \
-		debian/tmp/usr/lib/*/xfce4/session/xfsm-shutdown-helper \
-		debian/tmp/usr/lib/*/xfce4/session/splash-engines/*so \
-		debian/tmp/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.so
+		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/session/xfsm-shutdown-helper \
+		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/session/splash-engines/*so \
+		debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libxfsm-logout-plugin.so
 	
 	cat debian/debian-tips >> debian/tmp/usr/share/xfce4/tips/tips
 	strfile debian/tmp/usr/share/xfce4/tips/tips \
@@ -29,11 +29,11 @@
 	dh_install --fail-missing
 
 override_dh_shlibdeps:
-	dh_shlibdeps -X debian/xfce4-session/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.so -- \
-    -dRecommends debian/xfce4-session/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.so -dDepends
+	dh_shlibdeps -X debian/xfce4-session/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libxfsm-logout-plugin.so -- \
+    -dRecommends debian/xfce4-session/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libxfsm-logout-plugin.so -dDepends
 
 override_dh_makeshlibs:
-	dh_makeshlibs -X debian/xfce4-session/usr/lib/*/xfce4/panel/plugins/libxfsm-logout-plugin.so
+	dh_makeshlibs -X debian/xfce4-session/usr/lib/$(DEB_HOST_MULTIARCH)/xfce4/panel/plugins/libxfsm-logout-plugin.so
 
 override_dh_strip:
 	dh_strip --dbg-package=xfce4-session-dbg