lilypond-1.1.43

diff --git a/make/generic-rules.make b/make/generic-rules.make
index 1d885c7920faf1094b892d44d92d5033f34c3e93..e81890bf2da83a707bad08164fca5c3acf15e5c1 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-atfiles) | $(sed-atvariables) > $@
+       cat $< | sed $(sed-atfiles) $(sed-atvariables) > $@
 
 
 

diff --git a/stepmake/make/generic-rules.make b/stepmake/make/generic-rules.make
index 0213970378aa17042d12164ccd1ccbf9b984838d..224a5bf1ebfc5a4dba67251dff4c32f93d470b3e 100644 (file)
--- 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 f225effd8fbf853391774d7df8a5554d72ffa253..bb2785d4d418c6c48a69066daa36ebeaa0aa5517 100644 (file)
--- 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 1dca17b99537070a361275cb41a3c740e7b72731..813ffde61b16f4dc1407bae695cf5be6dee9fc57 100644 (file)
--- 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 6faf105a3869ec2ef6cf92a2570c3bd33a0bc98c..fa93fed6f6e8df992712adae79f87d231cfddfa6 100644 (file)
--- 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 823ada299581316d58ccaaf69b5d7e10b4d0b6ca..d310ae63a2e160a90056fa1aa26813f28a889a60 100644 (file)
--- 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