Updating branch refs/heads/master
to dd836eb551b46d73214eb0eb0c5aa28875cbe114 (commit)
from e7dd0c5e6fa4c70c3fbe8ff3ba9752f3123e9255 (commit)
commit dd836eb551b46d73214eb0eb0c5aa28875cbe114
Author: David Schneider <[email protected]>
Date: Wed Feb 15 00:55:14 2012 -0800
Got rid of unneeded desktop.in.in hack.
panel-plugin/Makefile.am | 14 ++------------
...temload.desktop.in.in => systemload.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 a37f6a6..a6d1849 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -46,25 +46,15 @@ libsystemload_la_LIBADD =
\
desktopdir = \
$(datadir)/xfce4/panel/plugins
-desktop_in_in_files = \
- systemload.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)
+ systemload.desktop
@INTLTOOL_DESKTOP_RULE@
EXTRA_DIST = \
- $(desktop_in_in_files)
+ systemload.desktop.in
CLEANFILES = \
- $(desktop_in_files) \
$(desktop_DATA)
# vi:set ts=8 sw=8 noet ai nocindent syntax=automake:
diff --git a/panel-plugin/systemload.desktop.in.in
b/panel-plugin/systemload.desktop.in
similarity index 100%
rename from panel-plugin/systemload.desktop.in.in
rename to panel-plugin/systemload.desktop.in
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 76a872c..d12aa7c 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,5 +2,5 @@ panel-plugin/cpu.c
panel-plugin/systemload.c
panel-plugin/uptime.c
panel-plugin/memswap.c
-panel-plugin/systemload.desktop.in.in
+panel-plugin/systemload.desktop.in
_______________________________________________
Xfce4-commits mailing list
[email protected]
https://mail.xfce.org/mailman/listinfo/xfce4-commits
