From: Daiki Ueno <ueno@gnu.org>
Date: Thu, 8 Oct 2015 05:49:30 +0000 (+0900)
Subject: hello-c-gnome3: Simplify the Desktop Entry rules
X-Git-Tag: v0.19.7~49
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ac1632889dfc001ca13a4debaf1e632889d866d0;p=thirdparty%2Fgettext.git

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.
---

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 07042373b..2851ec499 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 428bb86ab..d7168bce8 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)