lilypond-1.4.0

diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi
index 18d1639a029decfaf8953710b44df64c4ffe330d..e3a24669aa620c1fe5990b0c74a648c7ab8f73fb 100644 (file)
--- a/Documentation/topdocs/INSTALL.texi
+++ b/Documentation/topdocs/INSTALL.texi
@@ -35,8 +35,8 @@ site}.
 If you want to compile LilyPond from source, download here:
 @itemize @bullet
 @item Download development releases from
-@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/development/} by FTP and
-@uref{http://ftp.cs.uu.nl/pub/GNU/LilyPond/development/}, by HTTP.
+@uref{ftp://ftp.cs.uu.nl/pub/GNU/LilyPond/} by FTP and
+@uref{http://ftp.cs.uu.nl/pub/GNU/LilyPond/}, by HTTP.
 @item @uref{ftp://sca.uwaterloo.ca/pub/} by FTP (Canadian mirror)
 @item at @code{lilypond.org} 
 @uref{ftp://ftp.lilypond.org/pub/LilyPond/} by FTP and

diff --git a/make/redhat.spec.in b/make/redhat.spec.in
index 13408aa544c0e05adc9ee52607e56fedabcb4075..c096df8daeecde0dc230ad729aa7524d37c79b9a 100644 (file)
--- a/make/redhat.spec.in
+++ b/make/redhat.spec.in
@@ -38,14 +38,15 @@ The documentation of LilyPond, both in HTML and PostScript.
 # In fact, do not take out the spaces between % and { in the above comment,
 # because RPM will gladly do a substitution anyway.
 
-./configure --disable-checking --disable-debugging --enable-printing --prefix=%{_prefix} --disable-optimise --enable-shared
+./configure --disable-checking --prefix=%{_prefix} --enable-optimise
 
 make all
 
-# ok, now make sure that lilypond package will succeed,
-# even if documentation fails to build
-make -C Documentation  || true
-make web || true
+# make info
+make -C Documentation
+
+# make  html
+make web-doc top-web 
 
 %install
 
@@ -57,14 +58,14 @@ strip lily/out/lilypond midi2ly/out/midi2ly
 make prefix="$RPM_BUILD_ROOT%{_prefix}" install
 
 %if info=="yes"
-gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/* || true
+gzip -9fn $RPM_BUILD_ROOT%{_prefix}/info/*
 %endif
 
 mkdir -p $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d
 install -m 644 lilypond-mode.el lilypond-font-lock.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/
 install -m 644 lilypond-init.el $RPM_BUILD_ROOT/usr/share/emacs/site-lisp/site-start.d
 
-gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/* || true
+gzip -9fn $RPM_BUILD_ROOT%{_prefix}/man/man1/*
 
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d
 cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/lilypond.sh
@@ -73,7 +74,7 @@ cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT%{_prefix}/../etc/profile.d/li
 
 # again, make sure that main package installs even if doco fails
 mkdir -p web/out
-tar -C web -xzf out/web.tar.gz || true
+tar -C web -xzf out/web.tar.gz 
 
 
 %post
@@ -82,14 +83,14 @@ touch /tmp/.lilypond-install
 rm `find /var/lib/texmf -name 'feta*pk -print' -or -name 'feta*tfm -print'` /tmp/.lilypond-install
 
 %if info=="yes"
-/sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true
+/sbin/install-info %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir 
 %endif
 
 %preun
 
 %if info=="yes"
 if [ $1 = 0 ]; then
-    /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir || true
+    /sbin/install-info --delete %{_prefix}/info/lilypond.info.gz %{_prefix}/info/dir 
 fi
 %endif
 

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index b6d3ee6a26226895c813ac526552604c97538756..5b5da019255ed818cdfcd190d91573df25966227 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -562,10 +562,12 @@ def compose_full_body (body, opts):
        optstring = re.sub ('\n', ' ', optstring)
        body = r"""
 %% Generated automatically by: lilypond-book.py
-%% options are %s  %%ughUGH not original options
+%% options are %s  
 \include "paper%d.ly"
 \paper  { linewidth = %f \pt } 
 """ % (optstring, music_size, l) + body
+
+       # ughUGH not original options
        return body
 
 def parse_options_string(s):