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=4a81f5b5d3800aafbc25452e50459c1ba6e29fea The branch, stable-2.0 has been updated via 4a81f5b5d3800aafbc25452e50459c1ba6e29fea (commit) from 7eaa92ffa9594025d989d5584750b72fe5797c20 (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 4a81f5b5d3800aafbc25452e50459c1ba6e29fea Author: Ludovic Courtès <[email protected]> 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 @installed_guile@. ----------------------------------------------------------------------- Summary of changes: configure.ac | 5 ----- meta/Makefile.am | 14 ++++++++++++-- meta/guild.in | 6 ++---- 3 files changed, 14 insertions(+), 11 deletions(-) diff --git a/configure.ac b/configure.ac index 3969929..9f87809 100644 --- a/configure.ac +++ b/configure.ac @@ -1644,10 +1644,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]) @@ -1684,7 +1680,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 2d3c462..102b797 100644 --- a/meta/Makefile.am +++ b/meta/Makefile.am @@ -2,7 +2,7 @@ ## Jim Blandy <[email protected]> --- 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,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g" \ + -e "s,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g" \ + > "[email protected]" + chmod +x "[email protected]" + mv "[email protected]" "$@" + +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:-@bindir@/@guile_program_name@} $GUILE_FLAGS -e '(@@ (guild) main)' -s "$0" "$@" +exec ${GUILE:-@installed_guile@} $GUILE_FLAGS -e '(@@ (guild) main)' -s "$0" "$@" !# ;;;; guild --- running scripts bundled with Guile ;;;; Andy Wingo <[email protected]> --- 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
