[gnome-bluetooth/meego-dev: 5/15] Move the bluetooth panel binary to libexecdir

[Ross Burton <rburton src gnome org>]

commit ccd9ed86d57089ff7c3ad075661951c8913ba7d2
Author: Ross Burton <ross linux intel com>
Date:   Wed Feb 3 10:42:25 2010 +0000

    Move the bluetooth panel binary to libexecdir

 configure.ac                                       |    3 +++
 moblin/Makefile.am                                 |   10 ++--------
 moblin/bluetooth-panel.desktop.in.in               |    2 +-
 ...org.moblin.UX.Shell.Panels.bluetooth.service.in |    2 +-
 4 files changed, 7 insertions(+), 10 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index a4d6e5e..1dfd956 100644
--- a/configure.ac
+++ b/configure.ac
@@ -172,6 +172,8 @@ if test "x$enable_moblin" != "xno"; then
 
    PANEL_DIR=$($PKG_CONFIG moblin-panel --variable=moblin_panel_panels_dir)
    AC_SUBST(PANEL_DIR)
+
+   AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
 else
    have_moblin=no
 fi
@@ -210,6 +212,7 @@ AC_OUTPUT(Makefile
 	  sendto/Makefile
 	  moblin/Makefile
 	  moblin/bluetooth-panel.desktop.in
+          moblin/org.moblin.UX.Shell.Panels.bluetooth.service
 	  moblin/theme/Makefile
 	  moblin/moblin-copy-n-paste/Makefile
 	  moblin/moblin-icons/Makefile
diff --git a/moblin/Makefile.am b/moblin/Makefile.am
index 641d551..1b9713c 100644
--- a/moblin/Makefile.am
+++ b/moblin/Makefile.am
@@ -1,6 +1,6 @@
 SUBDIRS = moblin-copy-n-paste theme moblin-icons
 
-bin_PROGRAMS = bluetooth-panel
+libexec_PROGRAMS = bluetooth-panel
 
 bluetooth_panel_SOURCES = main.c \
 	moblin-panel.c moblin-panel.h \
@@ -29,18 +29,12 @@ paneldir = @PANEL_DIR@
 panel_DATA = $(desktop_data)
 
 servicedir = $(datadir)/dbus-1/services
-service_in_files = org.moblin.UX.Shell.Panels.bluetooth.service.in
 service_DATA = org.moblin.UX.Shell.Panels.bluetooth.service
 
- INTLTOOL_DESKTOP_RULE@
-
-CLEANFILES = $(autostart_DATA)
+CLEANFILES = $(desktop_DATA)
 
 EXTRA_DIST = $(autostart_in_in_files) $(ui_DATA) $(service_DATA)
 
 MAINTAINERCLEANFILES = Makefile.in
 
 DISTCLEANFILES = $(service_DATA)
-
-%.service: %.service.in
-	$(QUIET_GEN)sed -e "s|\ bindir\@|$(bindir)|" $< > $@
diff --git a/moblin/bluetooth-panel.desktop.in.in b/moblin/bluetooth-panel.desktop.in.in
index 97e5099..59274ec 100644
--- a/moblin/bluetooth-panel.desktop.in.in
+++ b/moblin/bluetooth-panel.desktop.in.in
@@ -4,7 +4,7 @@ Encoding=UTF-8
 _Name=Moblin Bluetooth Panel
 _Comment=Bluetooth Manager Panel
 Icon=bluetooth
-Exec=bluetooth-panel
+Exec= LIBEXECDIR@/bluetooth-panel
 Terminal=false
 Type=Application
 OnlyShowIn=MOBLIN;
diff --git a/moblin/org.moblin.UX.Shell.Panels.bluetooth.service.in b/moblin/org.moblin.UX.Shell.Panels.bluetooth.service.in
index 8ce0568..c0f0479 100644
--- a/moblin/org.moblin.UX.Shell.Panels.bluetooth.service.in
+++ b/moblin/org.moblin.UX.Shell.Panels.bluetooth.service.in
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=org.moblin.UX.Shell.Panels.bluetooth
-Exec= bindir@/bluetooth-panel
+Exec= LIBEXECDIR@/bluetooth-panel