mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-29 19:30:36 +02:00
Code Activity

build: Use pipe symbol instead of comma for substitutions.

Browse source 
* meta/Makefile.am (substitute): Use pipe symbol instead of comma for
  substitutions.
This commit is contained in:
Mark H Weaver 2015-03-06 23:56:14 -05:00
parent eb3d623da5
commit 9331f40a2d
1 changed files with 25 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

49
meta/Makefile.am
View file

@ -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" \