From f33228b6e88929fac0c1fbe396a69fa1f8891dd3 Mon Sep 17 00:00:00 2001 From: Ed Catmur Date: Wed, 7 Feb 2007 01:19:39 +0000 Subject: [PATCH] fix interpolate @lilypond_datadir@ in convert-ly etc --- make/generic-rules.make | 2 +- stepmake/stepmake/python-module-rules.make | 2 +- stepmake/stepmake/script-rules.make | 12 ++++++------ stepmake/stepmake/substitute-rules.make | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/make/generic-rules.make b/make/generic-rules.make index b41e4846f0..e02ba286c2 100644 --- 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 cb3ef487d8..f32732f584 100644 --- 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 bf6589e15c..0862d6b8d6 100644 --- 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 fc330548f6..879aec1f3b 100644 --- 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) > $@ -- 2.39.5