examples: Don't require msgfmt when compiling hello-c-gnome3

* hello-c-gnome3/Makefile.am (CLEANFILES): Clean hello.desktop.
(EXTRA_DIST): Add hello.desktop.in.
(MAINTAINERCLEANFILES): Add hello.desktop.in.
(hello.desktop): Move msgfmt invocation to...
(hello.desktop.in): ...here.

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index 25481fc9508c63674f87e63007efd67fde01b38d..226d84ba1c3c7191991e85138ffe2ff0705baa9f 100644 (file)
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,12 @@
+2014-06-03  Daiki Ueno  <ueno@gnu.org>
+
+       examples: Don't require msgfmt when compiling hello-c-gnome3
+       * hello-c-gnome3/Makefile.am (CLEANFILES): Clean hello.desktop.
+       (EXTRA_DIST): Add hello.desktop.in.
+       (MAINTAINERCLEANFILES): Add hello.desktop.in.
+       (hello.desktop): Move msgfmt invocation to...
+       (hello.desktop.in): ...here.
+
 2014-06-02  Daiki Ueno  <ueno@gnu.org>
 
        * gettext 0.19 released.

diff --git a/gettext-tools/examples/hello-c-gnome3/Makefile.am b/gettext-tools/examples/hello-c-gnome3/Makefile.am
index 613c7856c3d2b3f35a26d04e455360ecc024dac9..5164c0989acaf1be89f9102ff59b8d67dd2b2017 100644 (file)
--- a/gettext-tools/examples/hello-c-gnome3/Makefile.am
+++ b/gettext-tools/examples/hello-c-gnome3/Makefile.am
@@ -41,16 +41,21 @@ desktopdir = $(datadir)/applications
 desktop_DATA = hello.desktop
 
 hello.desktop.in: hello.desktop.in.in
-       $(AM_V_GEN) sed -e "s|@bindir[@]|$(bindir)|" \
-               -e "s|@VERSION[@]|$(VERSION)|" \
-               $< > $@ || rm $@
+       $(AM_V_GEN) $(MSGFMT) --desktop --template $< -o $@-t \
+         -d $(top_srcdir)/po && mv $@-t $@
 
 hello.desktop: hello.desktop.in
-       $(AM_V_GEN) $(MSGFMT) --desktop --template $< -o $@ -d $(top_srcdir)/po
+       @rm -f $@ $@-t
+       $(AM_V_GEN) srcdir=''; \
+         test -f ./$< || srcdir=$(srcdir)/; \
+         sed -e "s|@bindir[@]|$(bindir)|" $< > $@-t && mv $@-t $@
 
-CLEANFILES = $(BUILT_SOURCES) hello.desktop.in $(desktop_DATA)
+CLEANFILES = $(BUILT_SOURCES) hello.desktop $(desktop_DATA)
 
 # Additional files to be distributed.
-EXTRA_DIST = autogen.sh autoclean.sh hello.ui hello.desktop.in.in \
+EXTRA_DIST = autogen.sh autoclean.sh hello.ui \
+       hello.desktop.in.in hello.desktop.in \
        hello.gschema.xml \
        hello.gresource.xml
+
+MAINTAINERCLEANFILES = hello.desktop.in