[Guile-commits] GNU Guile branch, master, updated. v2.1.0-960-gd80b6ac

[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=d80b6acf198dddc90eba40a83de36b65ddf9f0ac

The branch, master has been updated
       via  d80b6acf198dddc90eba40a83de36b65ddf9f0ac (commit)
      from  3f69e638be12cfe9d5963df21e6c004a733f0ca1 (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 d80b6acf198dddc90eba40a83de36b65ddf9f0ac
Author: Ludovic Courtès <address@hidden>
Date:   Thu Apr 24 11:16:21 2014 +0200

    build: Honor program name transformation in 'guild'.
    
    * configure.ac: Remove erroneous 'guile_program_name' substitute; see
      <https://lists.gnu.org/archive/html/autoconf/2014-04/msg00010.html>
      for details.  Remove 'meta/guild' config file.
    * meta/Makefile.am (guild): New target.
      (CLEANFILES): Add 'guild'.
    * meta/guild.in: Remove 'prefix' and 'exec_prefix' definitions; use
      @address@hidden

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

Summary of changes:
 configure.ac     |    7 +------
 meta/Makefile.am |   14 ++++++++++++--
 meta/guild.in    |    6 ++----
 3 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 34c4aa4..57424f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,7 @@ dnl
 define(GUILE_CONFIGURE_COPYRIGHT,[[
 
 Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006,
-  2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc.
+  2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation, Inc.
 
 This file is part of GUILE
 
@@ -1602,10 +1602,6 @@ pkgdatadir="$datadir/$PACKAGE_TARNAME"
 sitedir="$pkgdatadir/site/$GUILE_EFFECTIVE_VERSION"
 AC_SUBST([sitedir])
 
-dnl Name of the `guile' program.
-guile_program_name="`echo guile | "$SED" "$program_transform_name"`"
-AC_SUBST([guile_program_name])
-
 # Additional SCM_I_GSC definitions are above.
 AC_SUBST([SCM_I_GSC_GUILE_DEBUG])
 AC_SUBST([SCM_I_GSC_ENABLE_DEPRECATED])
@@ -1642,7 +1638,6 @@ GUILE_CONFIG_SCRIPT([benchmark-guile])
 GUILE_CONFIG_SCRIPT([meta/guile])
 GUILE_CONFIG_SCRIPT([meta/uninstalled-env])
 GUILE_CONFIG_SCRIPT([meta/gdb-uninstalled-guile])
-GUILE_CONFIG_SCRIPT([meta/guild])
 GUILE_CONFIG_SCRIPT([libguile/guile-snarf])
 GUILE_CONFIG_SCRIPT([libguile/guile-snarf-docs])
 GUILE_CONFIG_SCRIPT([test-suite/standalone/test-use-srfi])
diff --git a/meta/Makefile.am b/meta/Makefile.am
index b96483b..a1452a0 100644
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@ -2,7 +2,7 @@
 ## Jim Blandy <address@hidden> --- September 1997
 ##
 ##     Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009, 2011,
-##        2012, 2013 Free Software Foundation, Inc.
+##        2012, 2013, 2014 Free Software Foundation, Inc.
 ##
 ##   This file is part of GUILE.
 ##   
@@ -54,4 +54,14 @@ guile-config: $(srcdir)/guile-config.in 
$(top_builddir)/config.status
        mv guile-config.out guile-config
        chmod +x guile-config
 
-CLEANFILES = guile-config
+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"
+       chmod +x "address@hidden"
+       mv "address@hidden" "$@"
+
+CLEANFILES = guile-config guild
diff --git a/meta/guild.in b/meta/guild.in
index d501a0d..a68e0ff 100755
--- a/meta/guild.in
+++ b/meta/guild.in
@@ -1,14 +1,12 @@
 #!/bin/sh
 # -*- scheme -*-
-prefix="@prefix@"
-exec_prefix="@exec_prefix@"
-exec ${GUILE:address@hidden@/@address@hidden $GUILE_FLAGS -e '(@@ (guild) 
main)' -s "$0" "$@"
+exec ${GUILE:address@hidden@} $GUILE_FLAGS -e '(@@ (guild) main)' -s "$0" "$@"
 !#
 
 ;;;; guild --- running scripts bundled with Guile
 ;;;; Andy Wingo <address@hidden> --- April 2009
 ;;;; 
-;;;;   Copyright (C) 2009, 2010, 2011, 2013 Free Software Foundation, Inc.
+;;;;   Copyright (C) 2009, 2010, 2011, 2013, 2014 Free Software Foundation, 
Inc.
 ;;;; 
 ;;;; This library is free software; you can redistribute it and/or
 ;;;; modify it under the terms of the GNU Lesser General Public


hooks/post-receive
-- 
GNU Guile