[gnome-main-menu] Use @BINDIR@/trigger-panel-run-dialog in its desktop file

[Vincent Untz <vuntz src gnome org>]

commit 0bc5a15bda520725b68da7fea93ba4b64cb6ef66
Author: Julian Andres Klode <jak debian org>
Date:   Sun Feb 7 15:41:00 2010 +0100

    Use @BINDIR@/trigger-panel-run-dialog in its desktop file
    
    Do not rely on trigger-panel-run-dialog being available in the
    path, but use the path we actually install it to. This is consistent
    with what is done for application-browser.desktop.

 main-menu/etc/Makefile.am                          |   12 +++++++++---
 ...ktop => trigger-panel-run-dialog.desktop.in.in} |    2 +-
 2 files changed, 10 insertions(+), 4 deletions(-)
---
diff --git a/main-menu/etc/Makefile.am b/main-menu/etc/Makefile.am
index 4bd24b9..161132a 100644
--- a/main-menu/etc/Makefile.am
+++ b/main-menu/etc/Makefile.am
@@ -9,8 +9,11 @@ schemas_DATA = slab.schemas
 uidir   = $(datadir)/gnome-2.0/ui
 ui_DATA = GNOME_MainMenu_ContextMenu.xml
 
+desktop_helperdir = $(datadir)/applications
+desktop_helper_DATA = gnome-screensaver-lock.desktop gnome-session-logout.desktop gnome-session-shutdown.desktop
+
 desktopdir   = $(datadir)/applications
-desktop_DATA = gnome-screensaver-lock.desktop gnome-session-logout.desktop gnome-session-shutdown.desktop trigger-panel-run-dialog.desktop
+desktop_DATA = trigger-panel-run-dialog.desktop
 @INTLTOOL_DESKTOP_RULE@
 
 bookmarkdir = $(datadir)/gnome-main-menu
@@ -19,6 +22,9 @@ bookmark_DATA = applications.xbel documents.xbel places.xbel empty.ots empty.ott
 systemitemsdir = $(datadir)/gnome-main-menu
 systemitems_DATA = system-items.xbel
 
+$(desktop_DATA).in: $(desktop_DATA).in.in
+	sed -e "s|\ BINDIR\@|$(bindir)|" $< > $@
+
 $(server_DATA).in: $(server_DATA).in.in
 	sed -e "s|\ LIBEXECDIR\@|$(libexecdir)|" $< > $@
 
@@ -35,6 +41,6 @@ install-data-local:
 		done \
 	fi
 
-EXTRA_DIST = $(server_DATA).in.in $(schemas_DATA).in.in $(ui_DATA) $(desktop_DATA) $(bookmark_DATA) $(systemitems_DATA).in
+EXTRA_DIST = $(server_DATA).in.in $(schemas_DATA).in.in $(ui_DATA) $(desktop_helper_DATA) $(desktop_DATA).in.in $(bookmark_DATA) $(systemitems_DATA).in
 
-CLEANFILES = $(server_DATA) $(schemas_DATA) $(server_DATA).in $(schemas_DATA).in $(systemitems_DATA)
+CLEANFILES = $(server_DATA) $(schemas_DATA) $(server_DATA).in $(schemas_DATA).in $(systemitems_DATA) $(desktop_DATA) $(desktop_DATA).in
diff --git a/main-menu/etc/trigger-panel-run-dialog.desktop b/main-menu/etc/trigger-panel-run-dialog.desktop.in.in
similarity index 84%
rename from main-menu/etc/trigger-panel-run-dialog.desktop
rename to main-menu/etc/trigger-panel-run-dialog.desktop.in.in
index f25d5a5..f2acfa4 100644
--- a/main-menu/etc/trigger-panel-run-dialog.desktop
+++ b/main-menu/etc/trigger-panel-run-dialog.desktop.in.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Run Application
 Comment=Show the "Run Application" panel app
-Exec=trigger-panel-run-dialog
+Exec= BINDIR@/trigger-panel-run-dialog
 Terminal=false
 Type=Application
 Icon=system-run