[Guile-commits] GNU Guile branch, master, updated. v2.1.0-961-g7a85f2b

[Ludovic Courtès]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=7a85f2b68ce8c7c8a28e6bde03b7c9da01004db5

The branch, master has been updated
       via  7a85f2b68ce8c7c8a28e6bde03b7c9da01004db5 (commit)
      from  d80b6acf198dddc90eba40a83de36b65ddf9f0ac (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7a85f2b68ce8c7c8a28e6bde03b7c9da01004db5
Author: Ludovic Courtès <address@hidden>
Date:   Thu Apr 24 23:46:20 2014 +0200

    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 <address@hidden>.

-----------------------------------------------------------------------

Summary of changes:
 meta/Makefile.am |   24 ++++++++++++------------
 1 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/meta/Makefile.am b/meta/Makefile.am
index a1452a0..283f3f1 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,address@hidden@],$(pkgconfigdir),g"                        
\
+              -e "s,address@hidden@],$(PKG_CONFIG),g"                          
\
+              -e "s,address@hidden@],$$guile,g"                                
\
+         < "$(srcdir)/guile-config.in"                                         
\
+         > "address@hidden"
+       chmod +x "address@hidden"
+       mv "address@hidden" "$@"
 
 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,address@hidden@],$(PACKAGE_NAME),g"                      
\
-                -e "s,address@hidden@],$(PACKAGE_BUGREPORT),g"         \
-       > "address@hidden"
+       $(SED) -e "s,address@hidden@],$$guile,g"                                
\
+              -e "s,address@hidden@],$(PACKAGE_NAME),g"                        
\
+              -e "s,address@hidden@],$(PACKAGE_BUGREPORT),g"           \
+         < "$(srcdir)/guild.in"                                                
\
+         > "address@hidden"
        chmod +x "address@hidden"
        mv "address@hidden" "$@"
 


hooks/post-receive
-- 
GNU Guile