From: Daiki Ueno <ueno@gnu.org>
Date: Sat, 7 Mar 2015 12:12:49 +0000 (+0900)
Subject: hello-c-gnome3: Simplify variable substitution
X-Git-Tag: v0.19.5~60
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4d2115c62a723dc9e375433261c1bf3e45928815;p=thirdparty%2Fgettext.git

hello-c-gnome3: Simplify variable substitution

* gettext-tools/examples/hello-c-gnome3/Makefile.am (hello.desktop):
Remove unnecessary $srcdir check.
---

diff --git a/gettext-tools/examples/ChangeLog b/gettext-tools/examples/ChangeLog
index ce8a28471..f847aca06 100644
--- a/gettext-tools/examples/ChangeLog
+++ b/gettext-tools/examples/ChangeLog
@@ -1,3 +1,8 @@
+2015-03-07  Daiki Ueno  <ueno@gnu.org>
+
+	* hello-c-gnome3/Makefile.am (hello.desktop): Remove unnecessary
+	$srcdir check.
+
 2015-03-06  Daiki Ueno  <ueno@gnu.org>
 
 	* hello-c-gnome3/Makefile.am: Suggest hello.desktop.in should be
diff --git a/gettext-tools/examples/hello-c-gnome3/Makefile.am b/gettext-tools/examples/hello-c-gnome3/Makefile.am
index a8f7f815d..428bb86ab 100644
--- a/gettext-tools/examples/hello-c-gnome3/Makefile.am
+++ b/gettext-tools/examples/hello-c-gnome3/Makefile.am
@@ -50,9 +50,7 @@ hello.desktop.in: hello.desktop.in.in
 
 hello.desktop: hello.desktop.in
 	@rm -f $@ $@-t
-	$(AM_V_GEN) srcdir=''; \
-	  test -f ./$< || srcdir=$(srcdir)/; \
-	  sed -e "s|@bindir[@]|$(bindir)|" $< > $@-t && mv $@-t $@
+	$(AM_V_GEN) sed -e 's|@bindir[@]|$(bindir)|g' $< > $@-t && mv $@-t $@
 
 CLEANFILES = $(BUILT_SOURCES) hello.desktop $(desktop_DATA)