bug-lilypond
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Release 1.5.27 Compile Error Correction


From: Jan Nieuwenhuizen
Subject: Re: Release 1.5.27 Compile Error Correction
Date: 27 Dec 2001 10:40:26 +0100

Howard & Theresa Selover <address@hidden> writes:

> I experienced another build error that was corrected by updating bison
> to the 1.30 version.  Using an older version of bison, the bison
> output file moved from the lily directory to the lily/out directory
> has a different name.

Thanks, this fix will be in .28

Jan.

Generated by address@hidden,
>From = lilypond-1.5.27.jcn1, To = lilypond-1.5.27.jcn2

usage 

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.5.27.jcn2.diff

Patches do not contain automatically generated files 
or (urg) empty directories, 
i.e., you should rerun autoconf, configure

diff -purN ../lilypond-1.5.27.jcn1/ChangeLog ./ChangeLog
--- ../lilypond-1.5.27.jcn1/ChangeLog   Tue Dec 25 13:49:55 2001
+++ ./ChangeLog Thu Dec 27 10:36:08 2001
@@ -1,3 +1,8 @@
+2001-12-27  Jan Nieuwenhuizen  <address@hidden>
+
+       * stepmake/stepmake/c++-rules.make:
+       * stepmake/stepmake/c-rules.make: Fixes for bison-1.28.
+
 2001-12-25  Jan Nieuwenhuizen  <address@hidden>
 
        * make/lilypond-vars.make: 
diff -purN ../lilypond-1.5.27.jcn1/VERSION ./VERSION
--- ../lilypond-1.5.27.jcn1/VERSION     Tue Dec 25 12:05:02 2001
+++ ./VERSION   Thu Dec 27 10:35:32 2001
@@ -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 -purN ../lilypond-1.5.27.jcn1/stepmake/stepmake/c++-rules.make 
./stepmake/stepmake/c++-rules.make
--- ../lilypond-1.5.27.jcn1/stepmake/stepmake/c++-rules.make    Mon Dec 17 
00:11:52 2001
+++ ./stepmake/stepmake/c++-rules.make  Thu Dec 27 10:33:38 2001
@@ -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 -purN ../lilypond-1.5.27.jcn1/stepmake/stepmake/c-rules.make 
./stepmake/stepmake/c-rules.make
--- ../lilypond-1.5.27.jcn1/stepmake/stepmake/c-rules.make      Mon Dec 17 
00:11:52 2001
+++ ./stepmake/stepmake/c-rules.make    Thu Dec 27 10:33:38 2001
@@ -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 $< > $@


-- 
Jan Nieuwenhuizen <address@hidden> | GNU LilyPond - The music typesetter
http://www.xs4all.nl/~jantien       | http://www.lilypond.org




reply via email to

[Prev in Thread] Current Thread [Next in Thread]