From 61fbc14840cf8308f6518791e79151415b0603a6 Mon Sep 17 00:00:00 2001
From: David Schneider <dnschneid@gmail.com>
Date: Wed, 15 Feb 2012 01:30:16 -0800
Subject: [PATCH] Removed desktop.in.in hackery.

---
 panel-plugin/Makefile.am          |   21 +++------------------
 panel-plugin/genmon.desktop.in    |    8 ++++++++
 panel-plugin/genmon.desktop.in.in |    8 --------
 po/POTFILES.in                    |    3 +--
 4 files changed, 12 insertions(+), 28 deletions(-)
 create mode 100644 panel-plugin/genmon.desktop.in
 delete mode 100644 panel-plugin/genmon.desktop.in.in

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 b/panel-plugin/genmon.desktop.in
new file mode 100644
index 0000000..d412ee4
--- /dev/null
+++ b/panel-plugin/genmon.desktop.in
@@ -0,0 +1,8 @@
+[Xfce Panel]
+Type=X-XFCE-PanelPlugin
+Encoding=UTF-8
+_Name=Generic Monitor
+_Comment=Show output of a command.
+Icon=utilities-system-monitor
+X-XFCE-Module=genmon
+X-XFCE-Internal=false
diff --git a/panel-plugin/genmon.desktop.in.in b/panel-plugin/genmon.desktop.in.in
deleted file mode 100644
index d412ee4..0000000
--- a/panel-plugin/genmon.desktop.in.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Xfce Panel]
-Type=X-XFCE-PanelPlugin
-Encoding=UTF-8
-_Name=Generic Monitor
-_Comment=Show output of a command.
-Icon=utilities-system-monitor
-X-XFCE-Module=genmon
-X-XFCE-Internal=false
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
-- 
1.7.5.4