patch::: 1.3.144.jcn4

[lilypond.git] / stepmake / stepmake / substitute-vars.make

diff --git a/stepmake/stepmake/substitute-vars.make b/stepmake/stepmake/substitute-vars.make
index 823ada299581316d58ccaaf69b5d7e10b4d0b6ca..cb23feff92f1759b2bd5715ab23347e188df36e8 100644 (file)
--- a/stepmake/stepmake/substitute-vars.make
+++ b/stepmake/stepmake/substitute-vars.make
@@ -10,14 +10,17 @@ 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
+
+# then remove them --hwn
+
 # use ATVARIABLES
 sed-date=sed 's!@DATE@!${date}!g'
 sed-PACKAGE = sed 's!@PACKAGE@!${PACKAGE}!g'