diff options
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | doc/ref/libguile-parallel.texi | 19 | ||||
| -rw-r--r-- | meta/Makefile.am | 60 | ||||
| -rw-r--r-- | meta/guile-2.2.pc.in | 7 |
4 files changed, 67 insertions, 24 deletions
diff --git a/configure.ac b/configure.ac index 6e83af159..19e00d818 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, 2014 Free Software Foundation, Inc. + 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Free Software Foundation, Inc. This file is part of GUILE @@ -1646,9 +1646,6 @@ AC_CONFIG_FILES([ module/Makefile ]) -AC_CONFIG_FILES([meta/guile-2.2.pc]) -AC_CONFIG_FILES([meta/guile-2.2-uninstalled.pc]) - GUILE_CONFIG_SCRIPT([check-guile]) GUILE_CONFIG_SCRIPT([benchmark-guile]) GUILE_CONFIG_SCRIPT([meta/guile]) diff --git a/doc/ref/libguile-parallel.texi b/doc/ref/libguile-parallel.texi index a0e1ea978..166766edf 100644 --- a/doc/ref/libguile-parallel.texi +++ b/doc/ref/libguile-parallel.texi @@ -1,7 +1,7 @@ @c -*-texinfo-*- @c This is part of the GNU Guile Reference Manual. -@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2010, 2011, 2013 -@c Free Software Foundation, Inc. +@c Copyright (C) 1996, 1997, 2000, 2001, 2002, 2003, 2004, 2005, 2010, 2011, +@c 2013-2014 Free Software Foundation, Inc. @c See the file guile.texi for copying conditions. @node Parallel Installations @@ -55,6 +55,21 @@ The default directory where Guile looks for extensions---i.e., shared libraries providing additional features (@pxref{Modules and Extensions}). Run @command{pkg-config guile-@value{EFFECTIVE-VERSION} --variable=extensiondir} to see its value. + +@item guile +@itemx guild +@cindex program name transformations, dealing with +The absolute file name of the @command{guile} and @command{guild} +commands@footnote{The @code{guile} and @code{guild} variables defined +starting from Guile version 2.0.12.}. Run @command{pkg-config +guile-@value{EFFECTIVE-VERSION} --variable=guile} or +@code{--variable=guild} to see their value. + +These variables allow users to deal with program name transformations +that may be specified when configuring Guile with +@code{--program-transform-name}, @code{--program-suffix}, or +@code{--program-prefix} (@pxref{Transformation Options,,, autoconf, GNU +Autoconf Manual}). @end table @noindent diff --git a/meta/Makefile.am b/meta/Makefile.am index 283f3f1f2..b543c5e0a 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, 2014 Free Software Foundation, Inc. +## 2012, 2013, 2014, 2015 Free Software Foundation, Inc. ## ## This file is part of GUILE. ## @@ -22,9 +22,10 @@ ## Fifth Floor, Boston, MA 02110-1301 USA bin_SCRIPTS = guile-config guild -EXTRA_DIST= \ - guile.m4 ChangeLog-2008 \ - guile-2.2.pc.in guile-2.2-uninstalled.pc.in \ +EXTRA_DIST= \ + guile.m4 ChangeLog-2008 \ + guile-$(GUILE_EFFECTIVE_VERSION).pc.in \ + guile-$(GUILE_EFFECTIVE_VERSION)-uninstalled.pc.in \ guild.in guile-config.in # What we now call `guild' used to be known as `guile-tools'. @@ -37,31 +38,54 @@ install-exec-hook: $(LN_S) "$$guild" "$$guile_tools" pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = guile-2.2.pc +pkgconfig_DATA = guile-$(GUILE_EFFECTIVE_VERSION).pc ## FIXME: in the future there will be direct automake support for ## doing this. When that happens, switch over. aclocaldir = $(datadir)/aclocal aclocal_DATA = guile.m4 +# Script to instantiate substitution variables found on the standard +# input. We do this from the Makefile because we need things like +# $(program_transform_name), which are not usable from 'configure.ac'. +substitute = \ + guile="`echo guile | $(SED) -e '$(program_transform_name)'`" ; \ + guild="`echo guild | $(SED) -e '$(program_transform_name)'`" ; \ + installed_guile="@bindir@/$$guile" ; \ + $(SED) -e "s,[@]PACKAGE_NAME[@],$(PACKAGE_NAME),g" \ + -e "s,[@]PACKAGE_BUGREPORT[@],$(PACKAGE_BUGREPORT),g" \ + -e "s,[@]PKG_CONFIG[@],$(PKG_CONFIG),g" \ + -e "s,[@]pkgconfigdir[@],$(pkgconfigdir),g" \ + -e "s,[@]prefix[@],$(prefix),g" \ + -e "s,[@]exec_prefix[@],$(exec_prefix),g" \ + -e "s,[@]bindir[@],$(bindir),g" \ + -e "s,[@]libdir[@],$(libdir),g" \ + -e "s,[@]includedir[@],$(includedir),g" \ + -e "s,[@]datarootdir[@],$(datarootdir),g" \ + -e "s,[@]datadir[@],$(datadir),g" \ + -e "s,[@]sitedir[@],$(sitedir),g" \ + -e "s,[@]guile[@],$$guile,g" \ + -e "s,[@]guild[@],$$guild,g" \ + -e "s,[@]installed_guile[@],$$installed_guile,g" + +guile-$(GUILE_EFFECTIVE_VERSION).pc: guile-$(GUILE_EFFECTIVE_VERSION).pc.in + $(substitute) < "$<" > "$@.out" + mv "$@.out" "$@" + +guile-$(GUILE_EFFECTIVE_VERSION)-uninstalled.pc: guile-$(GUILE_EFFECTIVE_VERSION)-uninstalled.pc.in + $(substitute) < "$<" > "$@.out" + mv "$@.out" "$@" + guile-config: $(srcdir)/guile-config.in $(top_builddir)/config.status - guile="@bindir@/`echo guile | $(SED) -e '$(program_transform_name)'`" ; \ - $(SED) -e "s,[@]pkgconfigdir[@],$(pkgconfigdir),g" \ - -e "s,[@]PKG_CONFIG[@],$(PKG_CONFIG),g" \ - -e "s,[@]installed_guile[@],$$guile,g" \ - < "$(srcdir)/guile-config.in" \ - > "$@.out" + $(substitute) < "$<" > "$@.out" chmod +x "$@.out" mv "$@.out" "$@" guild: $(srcdir)/guild.in $(top_builddir)/config.status - guile="@bindir@/`echo guile | $(SED) -e '$(program_transform_name)'`" ; \ - $(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" + $(substitute) < "$<" > "$@.out" chmod +x "$@.out" mv "$@.out" "$@" -CLEANFILES = guile-config guild +CLEANFILES = \ + guile-config guild \ + guile-$(GUILE_EFFECTIVE_VERSION).pc guile-$(GUILE_EFFECTIVE_VERSION)-uninstalled.pc diff --git a/meta/guile-2.2.pc.in b/meta/guile-2.2.pc.in index 1bda73449..c8f485bc1 100644 --- a/meta/guile-2.2.pc.in +++ b/meta/guile-2.2.pc.in @@ -1,5 +1,6 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ +bindir=@bindir@ libdir=@libdir@ includedir=@includedir@ datarootdir=@datarootdir@ @@ -11,6 +12,12 @@ sitedir=@sitedir@ extensiondir=@libdir@/guile/@GUILE_EFFECTIVE_VERSION@/extensions libguileinterface=@LIBGUILE_INTERFACE@ +# Actual name of the 'guile' and 'guild' programs. This is +# particularly useful when '--program-transform-name' or similar has +# been used. +guild=${bindir}/@guild@ +guile=${bindir}/@guile@ + Name: GNU Guile Description: GNU's Ubiquitous Intelligent Language for Extension Version: @GUILE_VERSION@ |