From: Ludovic Courtès <ludo@gnu.org>
Date: Thu, 24 Apr 2014 21:46:20 +0000 (+0200)
Subject: build: Clean up rules for meta/{guild,guile-config}.
X-Git-Url: https://git.hcoop.net/bpt/guile.git/commitdiff_plain/fd584ec6707ae5b6e7b07fe19443b513fb0ba62b

build: Clean up rules for meta/{guild,guile-config}.

* meta/Makefile.am (guile-config, guild): Avoid useless 'cat'
  invocation'.  Quote all occurrences of '@'.
  Suggested by Eric Blake <eblake@redhat.com>.
---

diff --git a/meta/Makefile.am b/meta/Makefile.am
index 102b7974d..57644bcd4 100644
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@ -46,21 +46,21 @@ aclocal_DATA = guile.m4
 
 guile-config: $(srcdir)/guile-config.in $(top_builddir)/config.status
 	guile="@bindir@/`echo guile | $(SED) -e '$(program_transform_name)'`" ;	\
-	cat $(srcdir)/guile-config.in						\
-	| $(SED) -e "s,@pkgconfigdir@,$(pkgconfigdir),g"			\
-		 -e "s,@""PKG_CONFIG@,$(PKG_CONFIG),g"				\
-		 -e "s,@installed_guile@,$$guile,g"				\
-	> guile-config.out
-	mv guile-config.out guile-config
-	chmod +x guile-config
+	$(SED) -e "s,[@]pkgconfigdir[@],$(pkgconfigdir),g"			\
+	       -e "s,[@]PKG_CONFIG[@],$(PKG_CONFIG),g"				\
+	       -e "s,[@]installed_guile[@],$$guile,g"				\
+	  < "$(srcdir)/guile-config.in"						\
+	  > "$@.out"
+	chmod +x "$@.out"
+	mv "$@.out" "$@"
 
 guild: $(srcdir)/guild.in $(top_builddir)/config.status
 	guile="@bindir@/`echo guile | $(SED) -e '$(program_transform_name)'`" ;	\
-	cat $(srcdir)/guild.in							\
-	| $(SED) -e "s,@installed_guile@,$$guile,g"				\
-	         -e "s,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g"			\
-	         -e "s,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g"		\
-	> "$@.out"
+	$(SED) -e "s,[@]installed_guile[@],$$guile,g"				\
+	       -e "s,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g"			\
+	       -e "s,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g"		\
+	  < "$(srcdir)/guild.in"						\
+	  > "$@.out"
 	chmod +x "$@.out"
 	mv "$@.out" "$@"