[Xfce4-commits] <terminal:master> Handle program name transformations in the desktop file.

[Nick Schermer]

Updating branch refs/heads/master
         to 0adbb41176af4368e965e9fdf4799adb4870745f (commit)
       from d7ca023219a1d429ce26742ec4e72d5218ecff46 (commit)

commit 0adbb41176af4368e965e9fdf4799adb4870745f
Author: Nick Schermer <nick at xfce.org>
Date:   Sun Feb 7 19:08:39 2010 +0100

    Handle program name transformations in the desktop file.

 Makefile.am                                        |   18 ++++++++++++++----
 ...-apps.xml.in => Terminal-default-apps.xml.in.in |    4 ++--
 Terminal.desktop.in => Terminal.desktop.in.in      |    2 +-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index a876b31..973dace 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -20,8 +20,13 @@ ChangeLog: Makefile
 
 dist-hook: ChangeLog
 
+package_exec=`echo $(PACKAGE) | sed '$(program_transform_name)'`
+
 desktopdir = $(datadir)/applications
-desktop_in_files = Terminal.desktop.in
+desktop_in_in_files = Terminal.desktop.in.in
+desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
+%.desktop.in: %.desktop.in.in
+	sed -e "s,\@PACKAGE_EXEC\@,$(package_exec),g" < $< > $@
 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
 @INTLTOOL_DESKTOP_RULE@
 
@@ -30,7 +35,10 @@ xmldir = $(GNOME_DEFAULT_APPSDIR)
 else
 xmldir = $(datadir)/gnome-control-center/default-apps
 endif
-xml_in_files = Terminal-default-apps.xml.in
+xml_in_in_files = Terminal-default-apps.xml.in.in
+xml_in_files = $(xml_in_in_files:.xml.in.in=.xml.in)
+%.xml.in: %.xml.in.in
+	sed -e "s,\@PACKAGE_EXEC\@,$(package_exec),g" < $< > $@
 xml_DATA = $(xml_in_files:.xml.in=.xml)
 @INTLTOOL_XML_RULE@
 
@@ -44,8 +52,8 @@ EXTRA_DIST = \
 	intltool-extract.in \
 	intltool-merge.in \
 	intltool-update.in \
-	$(desktop_in_files) \
-	$(xml_in_files) \
+	$(desktop_in_in_files) \
+	$(xml_in_in_files) \
 	$(ui_DATA)
 
 DISTCLEANFILES = \
@@ -53,7 +61,9 @@ DISTCLEANFILES = \
 	intltool-extract \
 	intltool-merge \
 	intltool-update \
+	$(desktop_in_files) \
 	$(desktop_DATA) \
+	$(xml_in_files) \
 	$(xml_DATA)
 
 DISTCHECK_CONFIGURE_FLAGS = \
diff --git a/Terminal-default-apps.xml.in b/Terminal-default-apps.xml.in.in
similarity index 77%
rename from Terminal-default-apps.xml.in
rename to Terminal-default-apps.xml.in.in
index 76592e6..7fb4386 100644
--- a/Terminal-default-apps.xml.in
+++ b/Terminal-default-apps.xml.in.in
@@ -4,8 +4,8 @@
   <terminals>
     <terminal>
       <_name>Xfce Terminal Emulator</_name>
-      <executable>Terminal</executable>
-      <command>Terminal</command>
+      <executable>@PACKAGE_EXEC@</executable>
+      <command>@PACKAGE_EXEC@</command>
       <icon-name>Terminal</icon-name>
       <exec-flag>-x</exec-flag>
     </terminal>
diff --git a/Terminal.desktop.in b/Terminal.desktop.in.in
similarity index 92%
rename from Terminal.desktop.in
rename to Terminal.desktop.in.in
index f0fc565..67347e0 100644
--- a/Terminal.desktop.in
+++ b/Terminal.desktop.in.in
@@ -3,7 +3,7 @@ Version=1.0
 _Name=Terminal
 _Comment=Terminal Emulator
 _GenericName=Terminal Emulator
-Exec=Terminal
+Exec=@PACKAGE_EXEC@
 Icon=Terminal
 Terminal=false
 Type=Application