[Guile-commits] 11/19: Merge commit '47ca15c7dffd14a82e75c1a0aeeaf2e77f3fa5b4'

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 1fc3fc11ffea3b5c0b1844306244b3f4a52c1067
Merge: 7c6ce75 47ca15c
Author: Andy Wingo <address@hidden>
Date:   Thu Jan 22 13:33:07 2015 +0100

    Merge commit '47ca15c7dffd14a82e75c1a0aeeaf2e77f3fa5b4'

 meta/Makefile.am |   32 +++++++++++++++++---------------
 1 files changed, 17 insertions(+), 15 deletions(-)

diff --cc meta/Makefile.am
index 5b89edb,0421277..c48e1ed
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@@ -75,24 -74,26 +75,26 @@@ substitute =                                       
                                
         -e "s,address@hidden@],$$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,address@hidden@],$(BDW_GC_CFLAGS),g"          \
-   -e "s,address@hidden@],$(BDW_GC_LIBS),g"            \
-   -e "s,address@hidden@],$(LIB_CLOCK_GETTIME),g"      \
-   -e "s,address@hidden@],$(LIBGMP),g"                 \
-   -e "s,address@hidden@],$(LIBLTDL),g"                        \
-   -e "s,address@hidden@],$(LIBFFI_LIBS),g"            \
-   -e "s,address@hidden@],$(LIBUNISTRING),g"           \
-   -e "s,address@hidden@],$(LIBICONV),g"                       \
-   -e "s,address@hidden@],$(LIBINTL),g"                        \
-   -e "s,address@hidden@],$(LIBSOCKET),g"                      \
-   -e "s,address@hidden@],$(SERVENT_LIB),g"            \
-   -e "s,address@hidden@],$(HOSTENT_LIB),g"            \
-   -e "s,address@hidden@],$(GETADDRINFO_LIB),g"        \
-   -e "s,address@hidden@],$(INET_NTOP_LIB),g"          \
-   -e "s,address@hidden@],$(INET_PTON_LIB),g"
+   -e "s|address@hidden@]|$(BDW_GC_CFLAGS)|g"          \
+   -e "s|address@hidden@]|$(BDW_GC_LIBS)|g"            \
+   -e "s|address@hidden@]|$(LIB_CLOCK_GETTIME)|g"      \
+   -e "s|address@hidden@]|$(LIBGMP)|g"                 \
+   -e "s|address@hidden@]|$(LIBLTDL)|g"                        \
+   -e "s|address@hidden@]|$(LIBFFI_LIBS)|g"            \
+   -e "s|address@hidden@]|$(LIBUNISTRING)|g"           \
+   -e "s|address@hidden@]|$(LIBICONV)|g"                       \
+   -e "s|address@hidden@]|$(LIBINTL)|g"                        \
+   -e "s|address@hidden@]|$(LIBSOCKET)|g"                      \
+   -e "s|address@hidden@]|$(SERVENT_LIB)|g"            \
+   -e "s|address@hidden@]|$(HOSTENT_LIB)|g"            \
+   -e "s|address@hidden@]|$(GETADDRINFO_LIB)|g"        \
+   -e "s|address@hidden@]|$(INET_NTOP_LIB)|g"          \
+   -e "s|address@hidden@]|$(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) < "$<" > "address@hidden"
        mv "address@hidden" "$@"