[Xfce4-commits] <xfce4-genmon-plugin:master> Removed desktop.in.in hackery. Patch from David Schneider.

[John Lindgren]

Updating branch refs/heads/master
         to e3b80386c076941bb43eac514143ab4a9d094b5b (commit)
       from 0c4c582e87f1f0b4b36782b3d4dc021bffce93df (commit)

commit e3b80386c076941bb43eac514143ab4a9d094b5b
Author: John Lindgren <john.lindgren at aol.com>
Date:   Wed May 9 19:11:57 2012 -0400

    Removed desktop.in.in hackery. Patch from David Schneider.

 panel-plugin/Makefile.am                           |   21 ++-----------------
 .../{genmon.desktop.in.in => genmon.desktop.in}    |    0
 po/POTFILES.in                                     |    3 +-
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 6e32d7c..11e821c 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -23,28 +23,13 @@ libgenmon_la_SOURCES =		\
 	cmdspawn.h		\
 	cmdspawn.c
 
-# .desktop file
-#
-# Some automake trickery here. Because we cannot use $(libdir) in the
-# automake stage, we'll use sed to get the full path into the .desktop file.
-# We also need to let intltool merge the translated fields, so we add an
-# additional level of indirection: a <name>.desktop.in.in file.
-# 
-desktop_in_in_files = genmon.desktop.in.in
-desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in)
-	
 desktopdir = $(datadir)/xfce4/panel/plugins
-desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
+desktop_DATA = genmon.desktop
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST = 								\
-	$(desktop_in_in_files)
+	genmon.desktop.in
 
 DISTCLEANFILES =							\
-	$(desktop_DATA) $(desktop_in_files)
-	
-# get full path into .desktop file
-$(desktop_in_files): $(desktop_in_in_files)
-	sed -e "s^@PLUGIN_PATH@^$(plugindir)^" \
-		$< > $@
+	$(desktop_DATA)
 
diff --git a/panel-plugin/genmon.desktop.in.in b/panel-plugin/genmon.desktop.in
similarity index 100%
rename from panel-plugin/genmon.desktop.in.in
rename to panel-plugin/genmon.desktop.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 3cc25fc..3d4d132 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,5 +1,4 @@
 panel-plugin/cmdspawn.c
 panel-plugin/config_gui.c
 panel-plugin/main.c
-
-panel-plugin/genmon.desktop.in.in
+panel-plugin/genmon.desktop.in