Install into /usr/lib/$arch, to be consistent with the other indicators.

Approved by PS Jenkins bot, Sebastien Bacher.

5 files changed, 6 insertions, 6 deletions

diff --git a/debian/gir1.2-messagingmenu-1.0.install b/debian/gir1.2-messagingmenu-1.0.install
index c1d8cfe..cbe4832 100644
--- a/debian/gir1.2-messagingmenu-1.0.install
+++ b/debian/gir1.2-messagingmenu-1.0.install
@@ -1 +1 @@
-usr/lib/girepository-1.0/*.typelib
+usr/lib/*/girepository-1.0 /usr/lib
diff --git a/debian/indicator-messages.install b/debian/indicator-messages.install
index 39c40f5..7406db8 100644
--- a/debian/indicator-messages.install
+++ b/debian/indicator-messages.install
@@ -1,4 +1,4 @@
-usr/lib/indicator-messages/indicator-messages-service
+usr/lib/*/indicator-messages/indicator-messages-service
 usr/share/dbus-1
 usr/share/glib-2.0
 usr/share/icons
diff --git a/debian/libmessaging-menu-dev.install b/debian/libmessaging-menu-dev.install
index 53e0312..7aa453e 100644
--- a/debian/libmessaging-menu-dev.install
+++ b/debian/libmessaging-menu-dev.install
@@ -1,5 +1,5 @@
-usr/lib/libmessaging-menu.so 
-usr/lib/pkgconfig
+usr/lib/*/libmessaging-menu.so 
+usr/lib/*/pkgconfig
 usr/include /usr/
 usr/share/gir-1.0/
 usr/share/vala/
diff --git a/debian/libmessaging-menu0.install b/debian/libmessaging-menu0.install
index 54b098e..6ee36e6 100644
--- a/debian/libmessaging-menu0.install
+++ b/debian/libmessaging-menu0.install
@@ -1 +1 @@
-usr/lib/libmessaging-menu.so.* /usr/lib/
+usr/lib/*/libmessaging-menu.so.*
diff --git a/debian/rules b/debian/rules
index 649b0ad..2909daf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ override_dh_autoreconf:
 	NO_CONFIGURE=1 dh_autoreconf ./autogen.sh
 
 override_dh_auto_configure:
-	dh_auto_configure -- --libdir="\$${prefix}/lib" --libexecdir="\$${prefix}/lib/indicator-messages" --enable-gtk-doc
+	dh_auto_configure -- --enable-gtk-doc
 
 override_dh_install:
 	find debian/tmp/usr/lib -name *.la -delete