From ac1632889dfc001ca13a4debaf1e632889d866d0 Mon Sep 17 00:00:00 2001 From: Daiki Ueno Date: Thu, 8 Oct 2015 14:49:30 +0900 Subject: [PATCH] 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. --- gettext-tools/examples/ChangeLog | 6 ++++++ gettext-tools/examples/hello-c-gnome3/Makefile.am | 7 +++---- 2 files changed, 9 insertions(+), 4 deletions(-) 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 + + * hello-c-gnome3/Makefile.am (hello.desktop.in): Don't use a + temporary file. + (hello.desktop): Likewise. + 2015-09-11 Daiki Ueno * 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) -- 2.47.2