fix interpolate @lilypond_datadir@ in convert-ly etc

diff --git a/make/generic-rules.make b/make/generic-rules.make
index b41e4846f0c37755aa969dbe0c2d17b8e2b22664..e02ba286c2e89d1554a16117c36e6e15d36e6962 100644 (file)
--- a/make/generic-rules.make
+++ b/make/generic-rules.make
@@ -7,7 +7,7 @@ $(outdir)/%.ly: %.lym4
 
 $(outdir)/%: %.in
        rm -f $@
-       cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
+       cat $< | sed $(sed-atfiles) | sed $(sed-atvariables) > $@
 
 
 

diff --git a/stepmake/stepmake/python-module-rules.make b/stepmake/stepmake/python-module-rules.make
index cb3ef487d8984f4ca7df3c90c0394828d5b865db..f32732f5847cb9e9bc052036269d05177bebc14c 100644 (file)
--- a/stepmake/stepmake/python-module-rules.make
+++ b/stepmake/stepmake/python-module-rules.make
@@ -9,6 +9,6 @@ $(outdir)/%.pyo: $(outdir)/%.py
        $(PYTHON) -O -c 'import py_compile; py_compile.compile ("$<")'
 
 $(outdir)/%.py: %.py $(config_make)
-       cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
+       cat $< | sed $(sed-atfiles) | sed $(sed-atvariables) > $@
        chmod 755 $@
 

diff --git a/stepmake/stepmake/script-rules.make b/stepmake/stepmake/script-rules.make
index bf6589e15c3c1796d85f4141b858ee6867f7e0a6..0862d6b8d641b5b48f5e47eb3dbee89c69b9dc00 100644 (file)
--- a/stepmake/stepmake/script-rules.make
+++ b/stepmake/stepmake/script-rules.make
@@ -1,25 +1,25 @@
 
 $(outdir)/%: %.pl $(config_make)  $(depth)/VERSION
-       cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
+       cat $< | sed $(sed-atfiles) | sed $(sed-atvariables) > $@
        chmod 755 $@
 
 $(outdir)/%: %.bash $(config_make) $(depth)/VERSION
-       cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
+       cat $< | sed $(sed-atfiles) | sed $(sed-atvariables) > $@
        chmod 755 $@
 
 $(outdir)/%: %.scm $(config_make) $(depth)/VERSION
-       cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
+       cat $< | sed $(sed-atfiles) | sed $(sed-atvariables) > $@
        chmod 755 $@
 
 $(outdir)/%: %.expect $(config_make) $(depth)/VERSION
-       cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
+       cat $< | sed $(sed-atfiles) | sed $(sed-atvariables) > $@
        chmod 755 $@
 
 $(outdir)/%: %.sh $(config_make) $(depth)/VERSION
-       cat $< | sed $(sed-atfiles)$(sed-atvariables) > $@
+       cat $< | sed $(sed-atfiles) | sed $(sed-atvariables) > $@
        chmod 755 $@
 
 $(outdir)/%: %.py $(config_make) $(depth)/VERSION
-       cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
+       cat $< | sed $(sed-atfiles) | sed $(sed-atvariables) > $@
        chmod 755 $@
 

diff --git a/stepmake/stepmake/substitute-rules.make b/stepmake/stepmake/substitute-rules.make
index fc330548f654bef8bc67263615d83ce242ad28e7..879aec1f3b90af4c0645f00fe51d34f785fdb540 100644 (file)
--- a/stepmake/stepmake/substitute-rules.make
+++ b/stepmake/stepmake/substitute-rules.make
@@ -2,6 +2,6 @@
 # config_make dep isn't working. Why?
 $(outdir)/%: %.in $(config_make) $(depth)/VERSION
        rm -f $@
-       cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
+       cat $< | sed $(sed-atfiles) | sed $(sed-atvariables) > $@