From: Daiki Ueno <ueno@gnu.org>
Date: Tue, 3 Jun 2014 07:57:34 +0000 (+0900)
Subject: examples: Don't require msgfmt when compiling hello-c-gnome3
X-Git-Tag: v0.19.1~14
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=be9a57aab7290b95a304be5a5bbfd4e537b8fbdf;p=thirdparty%2Fgettext.git

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 25481fc95..226d84ba1 100644
--- 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 613c7856c..5164c0989 100644
--- 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