X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fstepmake%2Fsubstitute-vars.make;h=8d7fd6295bd8264c2de8854a43355beda0c29c56;hb=b3af31f58d737806e4866810b82991ec161592d4;hp=823ada299581316d58ccaaf69b5d7e10b4d0b6ca;hpb=a41bc3e06fca46daa875419b5dc00dd958e1fde0;p=lilypond.git

diff --git a/stepmake/stepmake/substitute-vars.make b/stepmake/stepmake/substitute-vars.make
index 823ada2995..8d7fd6295b 100644
--- a/stepmake/stepmake/substitute-vars.make
+++ b/stepmake/stepmake/substitute-vars.make
@@ -1,4 +1,3 @@
-# Substitute.make
 
 sed-endline = sed 's!$$!\\!'
 sed-newline = sed 's!$$!\n!'
@@ -10,24 +9,11 @@ DATE = $(date)
 
 # for all FILE in AT_FILES:
 # substitute occurrences of @FILE@ with contents $(at-dir)BLA$(at-ext)
-sed-atfiles = cat $(foreach i, $(AT_FILES), \
-  | sed '/@$i@/r $(at-dir)$i$(at-ext)' | sed 's%@$i@%%g')
+sed-atfiles = -e '\#' $(foreach i, $(AT_FILES), \
+  -e '/@$i@/r $(at-dir)/$i$(at-ext)' -e 's%@$i@%%g')
 
 # for all VAR in ATVARIABLES
 # substitute occurrences of @VAR@ with $(VAR)
-sed-atvariables = cat $(foreach i, $(ATVARIABLES), | sed 's!@$i@!$($i)!g')
+sed-atvariables = -e '\#' $(foreach i, $(ATVARIABLES), -e 's!@$i@!$($i)!g')
 
-# these are obsolete
-# use ATVARIABLES
-sed-date=sed 's!@DATE@!${date}!g'
-sed-PACKAGE = sed 's!@PACKAGE@!${PACKAGE}!g'
-sed-bash = sed 's!@BASH@!$(BASH)!'
-sed-dir-datadir = sed 's!@DIR_DATADIR@!$(DIR_DATADIR)!'
-sed-package=sed 's!@package@!${package}!g'
-sed-perl = sed 's!@PERL@!$(PERL)!'
-sed-python = sed 's!@PYTHON@!$(PYTHON)!'
-sed-sh = sed 's!@SH@!$(SH)!'
-sed-shell = sed 's!@SH@!$(SHELL)!' | sed 's!@BASH@!$(BASH)!'
-sed-version= sed 's!@TOPLEVEL_VERSION@!${TOPLEVEL_VERSION}!g'
-sed-step-bindir = sed 's!@STEP_BINDIR@!$(pwd)/$(step-bindir)!'