[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Guile-commits] 01/01: build: Use pipe symbol instead of comma for subst
|
From: |
Mark H. Weaver |
|
Subject: |
[Guile-commits] 01/01: build: Use pipe symbol instead of comma for substitutions. |
|
Date: |
Sat, 07 Mar 2015 04:59:45 +0000 |
mhw pushed a commit to branch stable-2.0
in repository guile.
commit c74f776bbbfb90a155dd1a94dbcae74cc48c5f26
Author: Mark H Weaver <address@hidden>
Date: Fri Mar 6 23:56:14 2015 -0500
build: Use pipe symbol instead of comma for substitutions.
* meta/Makefile.am (substitute): Use pipe symbol instead of comma for
substitutions.
---
meta/Makefile.am | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/meta/Makefile.am b/meta/Makefile.am
index 0421277..12690c6 100644
--- a/meta/Makefile.am
+++ b/meta/Makefile.am
@@ -1,8 +1,8 @@
## Process this file with Automake to create Makefile.in
## Jim Blandy <address@hidden> --- September 1997
##
-## Copyright (C) 1998, 1999, 2001, 2006, 2007, 2008, 2009, 2011,
-## 2012, 2013, 2014 Free Software Foundation, Inc.
+## Copyright (C) 1998, 1999, 2001, 2006-2009, 2011-2015
+## Free Software Foundation, Inc.
##
## This file is part of GUILE.
##
@@ -47,35 +47,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,address@hidden@],$(PACKAGE_NAME),g"
\
- -e "s,address@hidden@],$(PACKAGE_BUGREPORT),g" \
- -e "s,address@hidden@],$(GUILE_EFFECTIVE_VERSION),g" \
- -e "s,address@hidden@],$(GUILE_VERSION),g"
\
- -e "s,address@hidden@],$(GUILE_CFLAGS),g"
\
- -e "s,address@hidden@],$(GUILE_LIBS),g"
\
- -e "s,address@hidden@],$(LIBGUILE_INTERFACE),g" \
+ $(SED) -e "s|address@hidden@]|$(PACKAGE_NAME)|g"
\
+ -e "s|address@hidden@]|$(PACKAGE_BUGREPORT)|g" \
+ -e "s|address@hidden@]|$(GUILE_EFFECTIVE_VERSION)|g" \
+ -e "s|address@hidden@]|$(GUILE_VERSION)|g"
\
+ -e "s|address@hidden@]|$(GUILE_CFLAGS)|g"
\
+ -e "s|address@hidden@]|$(GUILE_LIBS)|g"
\
+ -e "s|address@hidden@]|$(LIBGUILE_INTERFACE)|g" \
$(dependency_substitutions)
\
- -e "s,address@hidden@],$(PKG_CONFIG),g"
\
- -e "s,address@hidden@],$(pkgconfigdir),g"
\
- -e "s,address@hidden@],$(prefix),g"
\
- -e "s,address@hidden@],$(exec_prefix),g"
\
- -e "s,address@hidden@],$(bindir),g"
\
- -e "s,address@hidden@],$(libdir),g"
\
- -e "s,address@hidden@],$(includedir),g"
\
- -e "s,address@hidden@],$(datarootdir),g"
\
- -e "s,address@hidden@],$(datadir),g"
\
- -e "s,address@hidden@],$(sitedir),g"
\
- -e "s,address@hidden@],$$guile,g"
\
- -e "s,address@hidden@],$$guild,g"
\
- -e "s,address@hidden@],$$installed_guile,g"
+ -e "s|address@hidden@]|$(PKG_CONFIG)|g"
\
+ -e "s|address@hidden@]|$(pkgconfigdir)|g"
\
+ -e "s|address@hidden@]|$(prefix)|g"
\
+ -e "s|address@hidden@]|$(exec_prefix)|g"
\
+ -e "s|address@hidden@]|$(bindir)|g"
\
+ -e "s|address@hidden@]|$(libdir)|g"
\
+ -e "s|address@hidden@]|$(includedir)|g"
\
+ -e "s|address@hidden@]|$(datarootdir)|g"
\
+ -e "s|address@hidden@]|$(datadir)|g"
\
+ -e "s|address@hidden@]|$(sitedir)|g"
\
+ -e "s|address@hidden@]|$$guile|g"
\
+ -e "s|address@hidden@]|$$guild|g"
\
+ -e "s|address@hidden@]|$$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|address@hidden@]|$(BDW_GC_CFLAGS)|g" \
-e "s|address@hidden@]|$(BDW_GC_LIBS)|g" \