]> git.ipfire.org Git - thirdparty/gettext.git/commitdiff
hello-c-gnome3: Simplify the Desktop Entry rules
authorDaiki Ueno <ueno@gnu.org>
Thu, 8 Oct 2015 05:49:30 +0000 (14:49 +0900)
committerDaiki Ueno <ueno@gnu.org>
Thu, 8 Oct 2015 05:50:04 +0000 (14:50 +0900)
* hello-c-gnome3/Makefile.am (hello.desktop.in): Don't use a
temporary file.
(hello.desktop): Likewise.

gettext-tools/examples/ChangeLog
gettext-tools/examples/hello-c-gnome3/Makefile.am

index 07042373bbfb6a66e20804bcb596c7f2985d989c..2851ec4994ba39e4c694c54911a78f4d15f7406d 100644 (file)
@@ -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.
index 428bb86abe2563593dbcc3232e42268fbb00494b..d7168bce855f511f0fa484dbbfbff52b662f1704 100644 (file)
@@ -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)