From: fred <fred>
Date: Tue, 26 Mar 2002 21:49:35 +0000 (+0000)
Subject: lilypond-1.1.43
X-Git-Tag: release/1.5.59~2452
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=3337c9e4892b49ccce3f1216564ab34035639f6b;p=lilypond.git

lilypond-1.1.43
---

diff --git a/make/generic-rules.make b/make/generic-rules.make
index 1d885c7920..e81890bf2d 100644
--- a/make/generic-rules.make
+++ b/make/generic-rules.make
@@ -7,7 +7,7 @@ $(outdir)/%.ly: %.lym4
 
 $(outdir)/%: %.in
 	rm -f $@
-	cat $< | $(sed-atfiles) | $(sed-atvariables) > $@
+	cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
 
 
 
diff --git a/stepmake/make/generic-rules.make b/stepmake/make/generic-rules.make
index 0213970378..224a5bf1eb 100644
--- a/stepmake/make/generic-rules.make
+++ b/stepmake/make/generic-rules.make
@@ -6,6 +6,6 @@ include $(depth)/make/substitute.make
 
 $(outdir)/%: %.in
 	rm -f $@
-	cat $< | $(sed-atfiles) | $(sed-atvariables) > $@
+	cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
 
 
diff --git a/stepmake/stepmake/podir-targets.make b/stepmake/stepmake/podir-targets.make
index f225effd8f..bb2785d4d4 100644
--- a/stepmake/stepmake/podir-targets.make
+++ b/stepmake/stepmake/podir-targets.make
@@ -6,9 +6,9 @@ $(outdir)/%.mo: %.po
 	$(MSGFMT) -o $@ $<
 
 # sed-pofile = sed 's/^. \#: .*//'
-sed-pofile = sed 's/^\#: .*//'
-sed-makestuff = sed 's/[a-zA-Z_/]*make\[[0-9]*\].*//'
-sed-edstuff = sed 's/[ \.,adic0-9]*//' | sed 's/---//' | sort -u
+sed-pofile = -e 's/^\#: .*//'
+sed-makestuff = -e 's/[a-zA-Z_/]*make\[[0-9]*\].*//'
+sed-edstuff = -e 's/[ \.,adic0-9]*//' -e 's/---//' | sort -u
 
 po-update:
 	$(foreach i,$(CATALOGS), \
@@ -16,7 +16,7 @@ po-update:
 	  tupdate $(po-dir)/$(outdir)/$(package).po $(po-dir)/$(i).po \
 	    > $(po-dir)/$(outdir)/$(i).po && ) true
 	$(foreach i,$(CATALOGS), \
-	  changes=`$(MAKE) --silent -C $(po-dir) LANGUAGE=$$i po-changes $(ERROR_LOG) | $(sed-makestuff)`; \
+	  changes=`$(MAKE) --silent -C $(po-dir) LANGUAGE=$$i po-changes $(ERROR_LOG) | sed $(sed-makestuff)`; \
 	  if test "$$changes" != "" ; then \
 	    echo "*** Changes for language $$i; check po/$(outdir)/$$i.po ***"; \
 	    echo -e "changes: \`$$changes'";\
@@ -25,4 +25,4 @@ po-update:
 
 po-changes:
 	diff -e $(po-dir)/$(outdir)/$(LANGUAGE).po $(po-dir)/$(LANGUAGE).po \
-	  | $(sed-pofile) | $(sed-edstuff)
+	  | sed $(sed-pofile) $(sed-edstuff)
diff --git a/stepmake/stepmake/script-rules.make b/stepmake/stepmake/script-rules.make
index 1dca17b995..813ffde61b 100644
--- a/stepmake/stepmake/script-rules.make
+++ b/stepmake/stepmake/script-rules.make
@@ -1,19 +1,14 @@
-# Scripts.make
-
-
-
 
 $(outdir)/%: %.pl
-	cat $< | $(sed-atvariables) > $@
+	cat $< | sed $(sed-atvariables) > $@
 	chmod 755 $@
 
 #FIXME.  Check for bash?
 $(outdir)/%: %.sh
-	cat $< | $(sed-atvariables) > $@
+	cat $< | sed $(sed-atvariables) > $@
 	chmod 755 $@
 
-
 $(outdir)/%: %.py
-	cat $< | $(sed-atvariables) > $@
+	cat $< | sed $(sed-atvariables) > $@
 	chmod 755 $@
 
diff --git a/stepmake/stepmake/substitute-rules.make b/stepmake/stepmake/substitute-rules.make
index 6faf105a38..fa93fed6f6 100644
--- a/stepmake/stepmake/substitute-rules.make
+++ b/stepmake/stepmake/substitute-rules.make
@@ -1,5 +1,5 @@
 
 $(outdir)/%: %.in
 	rm -f $@
-	cat $< | $(sed-atfiles) | $(sed-atvariables) > $@
+	cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
 
diff --git a/stepmake/stepmake/substitute-vars.make b/stepmake/stepmake/substitute-vars.make
index 823ada2995..d310ae63a2 100644
--- a/stepmake/stepmake/substitute-vars.make
+++ b/stepmake/stepmake/substitute-vars.make
@@ -10,12 +10,12 @@ 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