diff options
| author | Andy Wingo <wingo@pobox.com> | 2015-01-22 13:32:59 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2015-01-22 13:32:59 +0100 |
| commit | 7c6ce75e2cc218e193b765149e619d1c9c69cbd6 (patch) | |
| tree | e57fbbba1efe88d6b24aecf38b38790ca27fe089 /meta/Makefile.am | |
| parent | 12dfe6568c82ba0e55286d1b604044f948dd16f2 (diff) | |
| parent | 7c433cbbce83bc9f2f9967afba00bbb68e312657 (diff) | |
| download | guile-7c6ce75e2cc218e193b765149e619d1c9c69cbd6.tar.gz | |
Merge commit '7c433cbbce83bc9f2f9967afba00bbb68e312657'
Conflicts:
meta/Makefile.am
Diffstat (limited to 'meta/Makefile.am')
| -rw-r--r-- | meta/Makefile.am | 60 |
1 files changed, 42 insertions, 18 deletions
diff --git a/meta/Makefile.am b/meta/Makefile.am index b543c5e0a..5b89edb9a 100644 --- a/meta/Makefile.am +++ b/meta/Makefile.am @@ -48,26 +48,50 @@ 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" \ +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,[@]GUILE_EFFECTIVE_VERSION[@],$(GUILE_EFFECTIVE_VERSION),g" \ + -e "s,[@]GUILE_VERSION[@],$(GUILE_VERSION),g" \ + -e "s,[@]GUILE_CFLAGS[@],$(GUILE_CFLAGS),g" \ + -e "s,[@]GUILE_LIBS[@],$(GUILE_LIBS),g" \ + -e "s,[@]LIBGUILE_INTERFACE[@],$(LIBGUILE_INTERFACE),g" \ + $(dependency_substitutions) \ + -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" +# Substitutions for dependencies that appear in 'guile-2.0.pc'. +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" + guile-$(GUILE_EFFECTIVE_VERSION).pc: guile-$(GUILE_EFFECTIVE_VERSION).pc.in $(substitute) < "$<" > "$@.out" mv "$@.out" "$@" |