[Xfce4-commits] <xfce4-embed-plugin:master> Got rid of desktop.in.in hack.

[David Schneider]

Updating branch refs/heads/master
         to 84f2dab01c3b83541b98cbd225d0297377ee80ce (commit)
       from d917a3a17873aebc8c92aa047bb42ba66d37d9a1 (commit)

commit 84f2dab01c3b83541b98cbd225d0297377ee80ce
Author: David Schneider <dnschneid at gmail.com>
Date:   Wed Feb 15 01:05:15 2012 -0800

    Got rid of desktop.in.in hack.

 panel-plugin/Makefile.am                           |   14 ++------------
 .../{embed.desktop.in.in => embed.desktop.in}      |    0
 po/POTFILES.in                                     |    2 +-
 3 files changed, 3 insertions(+), 13 deletions(-)

diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 09c400d..5b41120 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -47,25 +47,15 @@ libembed_la_LIBADD = \
 desktopdir =								\
 	$(datadir)/xfce4/panel/plugins
 
-desktop_in_in_files =							\
-	embed.desktop.in.in
-
-desktop_in_files =							\
-	$(desktop_in_in_files:.desktop.in.in=.desktop.in)
-
-$(desktop_in_files): $(desktop_in_in_files)
-	sed -e "s,\@libdir\@,$(libdir),g" < $< > $@
-
 desktop_DATA =								\
-	$(desktop_in_files:.desktop.in=.desktop)
+	embed.desktop
 
 @INTLTOOL_DESKTOP_RULE@
 
 EXTRA_DIST =								\
-	$(desktop_in_in_files)
+	embed.desktop.in
 
 CLEANFILES =								\
-	$(desktop_in_files)						\
 	$(desktop_DATA)
 
 # vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/panel-plugin/embed.desktop.in.in b/panel-plugin/embed.desktop.in
similarity index 100%
rename from panel-plugin/embed.desktop.in.in
rename to panel-plugin/embed.desktop.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8b77e8c..c7d1250 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,3 +1,3 @@
 panel-plugin/embed.c
 panel-plugin/embed-dialogs.c
-panel-plugin/embed.desktop.in.in
+panel-plugin/embed.desktop.in