patch::: 1.5.27.jcn2

2001-12-27  Jan Nieuwenhuizen  <janneke@gnu.org>

	* stepmake/stepmake/c++-rules.make:
	* stepmake/stepmake/c-rules.make: Fixes for bison-1.28.

diff --git a/ChangeLog b/ChangeLog
index bd5350712c382f72293f33e153396ef5c4d0c3e6..f3bc5bfe2719c6d5fe65f3f8cf65e7d5b05a31b2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2001-12-27  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * stepmake/stepmake/c++-rules.make:
+       * stepmake/stepmake/c-rules.make: Fixes for bison-1.28.
+
 2001-12-25  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * make/lilypond-vars.make: 

diff --git a/VERSION b/VERSION
index 02970366cd3fb5dea7268883e7d89c0e994409f1..ed162e12c4c5424acbdc1d120b0a1e70a47ec65d 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=27
-MY_PATCH_LEVEL=jcn1
+MY_PATCH_LEVEL=jcn2
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/stepmake/stepmake/c++-rules.make b/stepmake/stepmake/c++-rules.make
index 78bdfd026cb4805cbca5a0b621b1724447e461e8..1696b2e0aaf1315237d9d3237843a38481709d22 100644 (file)
--- a/stepmake/stepmake/c++-rules.make
+++ b/stepmake/stepmake/c++-rules.make
@@ -14,14 +14,14 @@ $(outdir)/%.lo: $(outdir)/%.cc
 
 $(outdir)/%.cc: %.yy
        $(BISON) $<
-       @-mv -f parser.tab.c parser.tab.cc  # bison < 1.30
-       mv parser.tab.cc $@
+       @-mv -f $(*F).yy.tab.c $(*F).tab.cc  # bison < 1.30
+       mv $(*F).tab.cc $@
 
 $(outdir)/%.hh: %.yy
        $(BISON) -d $<
-       @-mv -f parser.tab.h parser.tab.hh  # bison < 1.30
-       mv parser.tab.hh $@
-       rm -f parser.tab.c parser.tab.cc        # if this happens in the wrong order it triggers recompile of the .cc file 
+       @-mv -f $(*F).yy.tab.h $(*F).tab.hh  # bison < 1.30
+       mv $(*F).tab.hh $@
+       rm -f $(*F).tab.c $(*F).tab.cc  # if this happens in the wrong order it triggers recompile of the .cc file 
 
 $(outdir)/%.cc: %.ll
        $(FLEX) -Cfe -p -p -t $< > $@

diff --git a/stepmake/stepmake/c-rules.make b/stepmake/stepmake/c-rules.make
index 690a8a8d04de2aa4df944acbbba3a614fd80d724..fa16d4f6ee2f67c504b6968dff3df7fe1b156ff0 100644 (file)
--- a/stepmake/stepmake/c-rules.make
+++ b/stepmake/stepmake/c-rules.make
@@ -14,12 +14,12 @@ $(outdir)/%.lo: %.c
 
 $(outdir)/%.c: %.y
        $(BISON) $<
-       mv parser.tab.c $@
+       mv $(*F).tab.c $@
 
 $(outdir)/%.h: %.y
        $(BISON) -d $<
-       mv parser.tab.h $@
-       mv parser.tab.c $(basename $@).c
+       mv $(*F).tab.h $@
+       rm -f $(*F).tab.c # if this happens in the wrong order it triggers recompile of the .cc file 
 
 $(outdir)/%.c: %.l
        $(FLEX) -Cfe -p -p -t $< > $@