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

Approved by PS Jenkins bot, Sebastien Bacher.

8 files changed, 9 insertions, 9 deletions

diff --git a/data/Makefile.am b/data/Makefile.am
index 45ff12f..ab12dd6 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -4,7 +4,7 @@ dbus_servicesdir = $(datadir)/dbus-1/services
 dbus_services_DATA = indicator-messages.service
 
 %.service: %.service.in
-	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+	sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
 gsettings_SCHEMAS = com.canonical.indicator.messages.gschema.xml
 @GSETTINGS_RULES@
diff --git a/data/indicator-messages.service.in b/data/indicator-messages.service.in
index 12e41e6..b3ea054 100644
--- a/data/indicator-messages.service.in
+++ b/data/indicator-messages.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.canonical.indicator.messages
-Exec=@libexecdir@/indicator-messages-service
+Exec=@pkglibexecdir@/indicator-messages-service
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
diff --git a/src/Makefile.am b/src/Makefile.am
index 8d77dea..b9ea10a 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 
 EXTRA_DIST =
 
-libexec_PROGRAMS = indicator-messages-service
+pkglibexec_PROGRAMS = indicator-messages-service
 
 indicator_messages_service_SOURCES = \
 	messages-service.c \