Merge commit '47ca15c7dffd14a82e75c1a0aeeaf2e77f3fa5b4'

diff --combined meta/Makefile.am
index 5b89edb,0421277..c48e1ed
--- 1/meta/Makefile.am
--- 2/meta/Makefile.am
+++ b/meta/Makefile.am
@@@ -2,7 -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,10 -22,9 +22,10 @@@
  ##   Fifth Floor, Boston, MA 02110-1301 USA
  
  bin_SCRIPTS = guile-config guild
 -EXTRA_DIST= \
 -  guile.m4 ChangeLog-2008                     \
 -  guile-2.0.pc.in guile-2.0-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'.
@@@ -38,7 -37,7 +38,7 @@@ install-exec-hook
        $(LN_S) "$$guild" "$$guile_tools"
  
  pkgconfigdir = $(libdir)/pkgconfig
 -pkgconfig_DATA = guile-2.0.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.
@@@ -75,28 -74,30 +75,30 @@@ substitute =                                                                       
         -e "s,[@]installed_guile[@],$$installed_guile,g"
  
  # Substitutions for dependencies that appear in 'guile-2.0.pc'.
+ # Some of these may include things like "-Wl,-rpath", which is why we do
+ # not use a comma to separate the 's' arguments.
  dependency_substitutions =                            \
-   -e "s,[@]BDW_GC_CFLAGS[@],$(BDW_GC_CFLAGS),g"               \
-   -e "s,[@]BDW_GC_LIBS[@],$(BDW_GC_LIBS),g"           \
-   -e "s,[@]LIB_CLOCK_GETTIME[@],$(LIB_CLOCK_GETTIME),g"       \
-   -e "s,[@]LIBGMP[@],$(LIBGMP),g"                     \
-   -e "s,[@]LIBLTDL[@],$(LIBLTDL),g"                   \
-   -e "s,[@]LIBFFI_LIBS[@],$(LIBFFI_LIBS),g"           \
-   -e "s,[@]LIBUNISTRING[@],$(LIBUNISTRING),g"         \
-   -e "s,[@]LIBICONV[@],$(LIBICONV),g"                 \
-   -e "s,[@]LIBINTL[@],$(LIBINTL),g"                   \
-   -e "s,[@]LIBSOCKET[@],$(LIBSOCKET),g"                       \
-   -e "s,[@]SERVENT_LIB[@],$(SERVENT_LIB),g"           \
-   -e "s,[@]HOSTENT_LIB[@],$(HOSTENT_LIB),g"           \
-   -e "s,[@]GETADDRINFO_LIB[@],$(GETADDRINFO_LIB),g"   \
-   -e "s,[@]INET_NTOP_LIB[@],$(INET_NTOP_LIB),g"               \
-   -e "s,[@]INET_PTON_LIB[@],$(INET_PTON_LIB),g"
+   -e "s|[@]BDW_GC_CFLAGS[@]|$(BDW_GC_CFLAGS)|g"               \
+   -e "s|[@]BDW_GC_LIBS[@]|$(BDW_GC_LIBS)|g"           \
+   -e "s|[@]LIB_CLOCK_GETTIME[@]|$(LIB_CLOCK_GETTIME)|g"       \
+   -e "s|[@]LIBGMP[@]|$(LIBGMP)|g"                     \
+   -e "s|[@]LIBLTDL[@]|$(LIBLTDL)|g"                   \
+   -e "s|[@]LIBFFI_LIBS[@]|$(LIBFFI_LIBS)|g"           \
+   -e "s|[@]LIBUNISTRING[@]|$(LIBUNISTRING)|g"         \
+   -e "s|[@]LIBICONV[@]|$(LIBICONV)|g"                 \
+   -e "s|[@]LIBINTL[@]|$(LIBINTL)|g"                   \
+   -e "s|[@]LIBSOCKET[@]|$(LIBSOCKET)|g"                       \
+   -e "s|[@]SERVENT_LIB[@]|$(SERVENT_LIB)|g"           \
+   -e "s|[@]HOSTENT_LIB[@]|$(HOSTENT_LIB)|g"           \
+   -e "s|[@]GETADDRINFO_LIB[@]|$(GETADDRINFO_LIB)|g"   \
+   -e "s|[@]INET_NTOP_LIB[@]|$(INET_NTOP_LIB)|g"               \
+   -e "s|[@]INET_PTON_LIB[@]|$(INET_PTON_LIB)|g"
  
 -guile-2.0.pc: guile-2.0.pc.in
 +guile-$(GUILE_EFFECTIVE_VERSION).pc: guile-$(GUILE_EFFECTIVE_VERSION).pc.in
        $(substitute) < "$<" > "$@.out"
        mv "$@.out" "$@"
  
 -guile-2.0-uninstalled.pc: guile-2.0-uninstalled.pc.in
 +guile-$(GUILE_EFFECTIVE_VERSION)-uninstalled.pc: guile-$(GUILE_EFFECTIVE_VERSION)-uninstalled.pc.in
        $(substitute) < "$<" > "$@.out"
        mv "$@.out" "$@"
  
@@@ -112,4 -113,4 +114,4 @@@ guild: $(srcdir)/guild.in $(top_builddi
  
  CLEANFILES =                                  \
    guile-config guild                          \
 -  guile-2.0.pc guile-2.0-uninstalled.pc
 +  guile-$(GUILE_EFFECTIVE_VERSION).pc guile-$(GUILE_EFFECTIVE_VERSION)-uninstalled.pc