patch::: 1.0.7.jcn1: Hoi

pl 7.jcn1
	- minor stepmake/yodl fixes

diff --git a/NEWS b/NEWS
index ccd6913fa859d2dbcd0f1c67987400bf6dfb06a2..ebf46685f96a38f6dd48851afad7099381508026 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+pl 7.jcn1
+       - minor stepmake/yodl fixes
+
 pl 7
        - refman updates by Adriano Moriano.
 

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

diff --git a/aclocal.m4 b/aclocal.m4
index 9947522568236a9184ca9543fbceb68d3b7c6575..3f1287644c1be58dd7b23dc973f50c7f373f58b4 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -439,6 +439,7 @@ AC_DEFUN(AC_STEPMAKE_YODL, [
        AC_CHECK_PROGS(YODL2HTML, yodl2html, -echo no yodl)
        AC_CHECK_PROGS(YODL2LATEX, yodl2latex, )
        AC_CHECK_PROGS(YODL2MAN, yodl2man, -echo no yodl)
+       AC_CHECK_PROGS(YODL2MSLESS, yodl2msless, -echo no yodl)
        AC_CHECK_PROGS(YODL2TEXINFO, yodl2texinfo, -echo no yodl)
        AC_CHECK_PROGS(YODL2TXT, yodl2txt, -echo no yodl)
     else
@@ -446,9 +447,10 @@ AC_DEFUN(AC_STEPMAKE_YODL, [
        AC_SUBST(YODL2HTML)
        AC_SUBST(YODL2LATEX)
        AC_SUBST(YODL2MAN)
+       AC_SUBST(YODL2MSLESS)
        AC_SUBST(YODL2TEXINFO)
        AC_SUBST(YODL2TXT)
-       export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2TEXINFO YODL2TXT
+       export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT
     fi
     if test "x$YODL" = "-echo no yodl"; then
        AC_STEPMAKE_WARN(Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl))

diff --git a/config.make.in b/config.make.in
index e15719086f9b428053a6db563064372200aa85e9..5ab98dd83adaadaaf1cfe405004815180ab4f772 100644 (file)
--- a/config.make.in
+++ b/config.make.in
@@ -4,6 +4,7 @@
 
 package-depth = @package_depth@
 
+USER_CFLAGS = @CFLAGS@
 USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@
 USER_LDFLAGS = 
 
@@ -55,6 +56,7 @@ YODL= @YODL@
 YODL2HTML= @YODL2HTML@
 YODL2LATEX= @YODL2LATEX@
 YODL2MAN= @YODL2MAN@
+YODL2MSLESS= @YODL2MSLESS@
 YODL2TEXINFO= @YODL2TEXINFO@
 YODL2TXT= @YODL2TXT@
 ZIP = @ZIP@

diff --git a/lily/VERSION b/lily/VERSION
index 027e590313a0e441744df6d82c4a15bc3d7cdb79..d67991c8a0c636f4fbeb45a9dd7c1e30f6186767 100644 (file)
--- a/lily/VERSION
+++ b/lily/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
 PATCH_LEVEL=7
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/make/STATE-VECTOR b/make/STATE-VECTOR
index c042666d02a6205d311d2031a81a9150bfb9a793..ac00f8bd4bc7c8d7b935297ad6b330f3e9082069 100644 (file)
--- a/make/STATE-VECTOR
+++ b/make/STATE-VECTOR
@@ -72,3 +72,4 @@
 1.0.6
 1.0.6.uu1
 1.0.7
+1.0.7.jcn1

diff --git a/stepmake/NEWS b/stepmake/NEWS
index 9eaeacf1c8f4fccc248cebf19e6db5210d6b2210..cc68cff9219b8df90aa424a2c41755c5e553f272 100644 (file)
--- a/stepmake/NEWS
+++ b/stepmake/NEWS
@@ -1,3 +1,10 @@
+pl 49
+       - use yodl2ms and striproff for txt conversion
+       - bf: chmod fail
+
+pl 48
+       - bumped version for yodl after various (lily pl7) changes
+
 pl 47
        - bf: patch in website after 'make release'
        - windows ln -> cp

diff --git a/stepmake/VERSION b/stepmake/VERSION
index 0aaf2231f72326f5aa00c8de3bd6f9be8474541b..eb46477624aaff48f97d76730100a90fdf81b8b0 100644 (file)
--- a/stepmake/VERSION
+++ b/stepmake/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=StepMake
 MAJOR_VERSION=0
 MINOR_VERSION=1
-PATCH_LEVEL=47
+PATCH_LEVEL=49
 MY_PATCH_LEVEL=
 
 # use the above to send patches, always empty for released version:

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 06abbe832a0a47909bc8ca5166e2959af7972184..89c324e3d06fe3e5ae09261ce61f3377847d783f 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -437,6 +437,7 @@ AC_DEFUN(AC_STEPMAKE_YODL, [
        AC_CHECK_PROGS(YODL2HTML, yodl2html, -echo no yodl)
        AC_CHECK_PROGS(YODL2LATEX, yodl2latex, )
        AC_CHECK_PROGS(YODL2MAN, yodl2man, -echo no yodl)
+       AC_CHECK_PROGS(YODL2MSLESS, yodl2msless, -echo no yodl)
        AC_CHECK_PROGS(YODL2TEXINFO, yodl2texinfo, -echo no yodl)
        AC_CHECK_PROGS(YODL2TXT, yodl2txt, -echo no yodl)
     else
@@ -444,9 +445,10 @@ AC_DEFUN(AC_STEPMAKE_YODL, [
        AC_SUBST(YODL2HTML)
        AC_SUBST(YODL2LATEX)
        AC_SUBST(YODL2MAN)
+       AC_SUBST(YODL2MSLESS)
        AC_SUBST(YODL2TEXINFO)
        AC_SUBST(YODL2TXT)
-       export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2TEXINFO YODL2TXT
+       export YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT
     fi
     if test "x$YODL" = "-echo no yodl"; then
        AC_STEPMAKE_WARN(Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl))

diff --git a/stepmake/config.make.in b/stepmake/config.make.in
index e15719086f9b428053a6db563064372200aa85e9..5ab98dd83adaadaaf1cfe405004815180ab4f772 100644 (file)
--- a/stepmake/config.make.in
+++ b/stepmake/config.make.in
@@ -4,6 +4,7 @@
 
 package-depth = @package_depth@
 
+USER_CFLAGS = @CFLAGS@
 USER_CXXFLAGS = @CXXFLAGS@ @CPPFLAGS@
 USER_LDFLAGS = 
 
@@ -55,6 +56,7 @@ YODL= @YODL@
 YODL2HTML= @YODL2HTML@
 YODL2LATEX= @YODL2LATEX@
 YODL2MAN= @YODL2MAN@
+YODL2MSLESS= @YODL2MSLESS@
 YODL2TEXINFO= @YODL2TEXINFO@
 YODL2TXT= @YODL2TXT@
 ZIP = @ZIP@

diff --git a/stepmake/stepmake/automatically-generated.sub.make b/stepmake/stepmake/automatically-generated.sub.make
index 5697a8c765b9c9cfc0770155da0c1a9825820401..1bfa90c33927bb895467d758c31ef98073d93e60 100644 (file)
--- a/stepmake/stepmake/automatically-generated.sub.make
+++ b/stepmake/stepmake/automatically-generated.sub.make
@@ -2,7 +2,7 @@
 LINECOMMENT=\#
 
 default:
-       chmod +w $(OUTFILE)
+       -chmod +w $(OUTFILE)
        echo "$(LINECOMMENT) WARNING WARNING WARNING WARNING" > $(OUTFILE)
        echo "$(LINECOMMENT) do not edit! this is $(OUTFILE), generated from $(INFILE)" >> $(OUTFILE)
        cat $(INFILE) >> $(OUTFILE)

diff --git a/stepmake/stepmake/documentation-rules.make b/stepmake/stepmake/documentation-rules.make
index 1f6d77316e2a02cfecb87f795176de1dab5179a6..e7ac7462470d4b4b630b3fc42fb56a56d1b60920 100644 (file)
--- a/stepmake/stepmake/documentation-rules.make
+++ b/stepmake/stepmake/documentation-rules.make
@@ -8,6 +8,7 @@
 $(outdir)/%.gif: %.xpm
        xpmtoppm $< | ppmtogif > $@
 
+# use striproff?
 $(outdir)/%.txt: $(outdir)/%.1
        troff -man -Tascii $< | grotty -b -u -o > $@
 

diff --git a/stepmake/stepmake/yodl-rules.make b/stepmake/stepmake/yodl-rules.make
index 34542d3f2bdb870b6f68b9dc0e66f99fd614f2b2..7daf7974c2ff5a4f868c8847d9ac2097d583fbf1 100644 (file)
--- a/stepmake/stepmake/yodl-rules.make
+++ b/stepmake/stepmake/yodl-rules.make
@@ -22,5 +22,7 @@ $(outdir)/%.texinfo: %.yo
        $(YODL2TEXINFO) -doutdir=$(outdir) --live-data=3 -o $@ $<
 
 $(outdir)/%.txt: %.yo
-       $(YODL2TXT) -doutdir=$(outdir) --live-data=3 -o $@ $<
+#      $(YODL2TXT) -doutdir=$(outdir) --live-data=3 -o $@ $<
+       $(YODL2MSLESS) -doutdir=$(outdir) --live-data=3 $< | striproff > $@
+       rm -f $(basename $<).ms