summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaiki Ueno <ueno@gnu.org>2015-10-08 14:49:30 +0900
committerDaiki Ueno <ueno@gnu.org>2015-10-08 14:50:04 +0900
commitac1632889dfc001ca13a4debaf1e632889d866d0 (patch)
treee8515eed6ea3fb3813afcb0dee696e8a29772c90
parent3231fe880325b1ecb82c3a8a4e90ce53bece3161 (diff)
downloadexternal_gettext-ac1632889dfc001ca13a4debaf1e632889d866d0.zip
external_gettext-ac1632889dfc001ca13a4debaf1e632889d866d0.tar.gz
external_gettext-ac1632889dfc001ca13a4debaf1e632889d866d0.tar.bz2
hello-c-gnome3: Simplify the Desktop Entry rules
* hello-c-gnome3/Makefile.am (hello.desktop.in): Don't use a temporary file. (hello.desktop): Likewise.
-rw-r--r--gettext-tools/examples/ChangeLog6
-rw-r--r--gettext-tools/examples/hello-c-gnome3/Makefile.am7
2 files changed, 9 insertions, 4 deletions
diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 0704237..2851ec4 100644
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,9 @@
+2015-10-08 Daiki Ueno <ueno@gnu.org>
+
+ * hello-c-gnome3/Makefile.am (hello.desktop.in): Don't use a
+ temporary file.
+ (hello.desktop): Likewise.
+
2015-09-11 Daiki Ueno <ueno@gnu.org>
* gettext 0.19.6 released.
diff --git a/gettext-tools/examples/hello-c-gnome3/Makefile.am b/gettext-tools/examples/hello-c-gnome3/Makefile.am
index 428bb86..d7168bc 100644
--- a/gettext-tools/examples/hello-c-gnome3/Makefile.am
+++ b/gettext-tools/examples/hello-c-gnome3/Makefile.am
@@ -45,12 +45,11 @@ desktop_DATA = hello.desktop
# processed earlier than the variable substitution below. Otherwise,
# the 'msgfmt' command will be required at compile-time.
hello.desktop.in: hello.desktop.in.in
- $(AM_V_GEN) $(MSGFMT) --desktop --template $< -o $@-t \
- -d $(top_srcdir)/po && mv $@-t $@
+ $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
+# Substitute variables in a Desktop Entry file.
hello.desktop: hello.desktop.in
- @rm -f $@ $@-t
- $(AM_V_GEN) sed -e 's|@bindir[@]|$(bindir)|g' $< > $@-t && mv $@-t $@
+ $(AM_V_GEN) sed -e 's|@bindir[@]|$(bindir)|g' $< > $@
CLEANFILES = $(BUILT_SOURCES) hello.desktop $(desktop_DATA)