diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-04-24 11:16:21 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-04-24 11:51:19 +0200 |
| commit | d80b6acf198dddc90eba40a83de36b65ddf9f0ac (patch) | |
| tree | 7cd8a9c932b013186a5abb53ea836f2ecfd48a92 /meta | |
| parent | 3f69e638be12cfe9d5963df21e6c004a733f0ca1 (diff) | |
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@.
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/Makefile.am | 14 | ||||
| -rwxr-xr-x | meta/guild.in | 6 |
2 files changed, 14 insertions, 6 deletions
diff --git a/meta/Makefile.am b/meta/Makefile.am index b96483bbd..a1452a058 100644 --- a/meta/Makefile.am +++ b/meta/Makefile.am @@ -2,7 +2,7 @@ ## Jim Blandy <jimb@red-bean.com> --- 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" \ + > "$@.out" + chmod +x "$@.out" + mv "$@.out" "$@" + +CLEANFILES = guile-config guild diff --git a/meta/guild.in b/meta/guild.in index d501a0daf..a68e0ff95 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 <wingo@pobox.com> --- 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 |