From 747d350b2261b027c12eadb405595d6e7dc5d858 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Thu, 27 Dec 2001 10:36:08 +0100
Subject: [PATCH] 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.
---
 ChangeLog                        |  5 +++++
 VERSION                          |  2 +-
 stepmake/stepmake/c++-rules.make | 10 +++++-----
 stepmake/stepmake/c-rules.make   |  6 +++---
 4 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index bd5350712c..f3bc5bfe27 100644
--- 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 02970366cd..ed162e12c4 100644
--- 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 78bdfd026c..1696b2e0aa 100644
--- 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 690a8a8d04..fa16d4f6ee 100644
--- 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 $< > $@
-- 
2.39.5