diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-01-22 13:33:07 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-01-22 13:33:07 +0100 |
| commit | 1fc3fc11ffea3b5c0b1844306244b3f4a52c1067 (patch) | |
| tree | 51d7ff39e18a07833d7ed112143756d2d3d2e6fe /meta | |
| parent | 7c6ce75e2cc218e193b765149e619d1c9c69cbd6 (diff) | |
| parent | 47ca15c7dffd14a82e75c1a0aeeaf2e77f3fa5b4 (diff) | |
Merge commit '47ca15c7dffd14a82e75c1a0aeeaf2e77f3fa5b4'
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/Makefile.am | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/meta/Makefile.am b/meta/Makefile.am index 5b89edb9a..c48e1ed01 100644 --- a/meta/Makefile.am +++ b/meta/Makefile.am @@ -75,22 +75,24 @@ 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-$(GUILE_EFFECTIVE_VERSION).pc: guile-$(GUILE_EFFECTIVE_VERSION).pc.in $(substitute) < "$<" > "$@.out" |