diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-12-06 15:57:23 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-12-06 15:57:23 +0100 |
| commit | 47ca15c7dffd14a82e75c1a0aeeaf2e77f3fa5b4 (patch) | |
| tree | ed78f09a3573af46365a9388f3e4be7f04558cd3 /meta | |
| parent | 7c433cbbce83bc9f2f9967afba00bbb68e312657 (diff) | |
| download | guile-47ca15c7dffd14a82e75c1a0aeeaf2e77f3fa5b4.tar.gz | |
build: Better handle substitutions in 'guile-2.0.pc' & co.
* meta/Makefile.am (dependency_substitutions): Use '|' as the separate
instead of ','. See <http://hydra.nixos.org/build/17684751>.
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 b48c8ec8a..0421277fb 100644 --- a/meta/Makefile.am +++ b/meta/Makefile.am @@ -74,22 +74,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-2.0.pc: guile-2.0.pc.in $(substitute) < "$<" > "$@.out" |