diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-03-06 23:56:14 -0500 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-03-07 00:13:36 -0500 |
| commit | 9331f40a2ddc0db02a52f77063d915afe82efb49 (patch) | |
| tree | 0e41d9e6ef00e3ff5e21d9420ad3b6fc12731237 /meta | |
| parent | eb3d623da57e6d31a58d95f932345fb761f9b701 (diff) | |
build: Use pipe symbol instead of comma for substitutions.
* meta/Makefile.am (substitute): Use pipe symbol instead of comma for
substitutions.
Diffstat (limited to 'meta')
| -rw-r--r-- | meta/Makefile.am | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/meta/Makefile.am b/meta/Makefile.am index c48e1ed01..d49ebd9ac 100644 --- a/meta/Makefile.am +++ b/meta/Makefile.am @@ -1,8 +1,8 @@ ## Process this file with Automake to create Makefile.in ## Jim Blandy <jimb@red-bean.com> --- September 1997 ## -## Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009, 2011, -## 2012, 2013, 2014, 2015 Free Software Foundation, Inc. +## Copyright (C) 1998, 1999, 2001, 2006-2009, 2011-2015 +## Free Software Foundation, Inc. ## ## This file is part of GUILE. ## @@ -48,35 +48,36 @@ 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'. +# +# Some of these may include things like "-Wl,-rpath", which is why we do +# not use a comma to separate the 's' arguments. 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" \ + $(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" + -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'. -# 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" \ |