release commit

diff --git a/GNUmakefile.in b/GNUmakefile.in
index 249a3ad3fa7648136042f157eb12e05c542e2b3f..1e9f5390752edb658372c8115012021632ced055 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -39,7 +39,7 @@ pfa-fonts:
                tar czvf ../../../$(outbase)/type1.tar.gz type1/*.pfa type1/fonts.* type1/lilypond.* )
 
 web-install: 
-       $(INSTALL) -m 755 -d $(webdir) 
+       -$(INSTALL) -m 755 -d $(webdir) 
        tar -C $(webdir)/ -xzf $(outdir)/web.tar.gz
 
 local-install:

diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc
index 20cff55c0e447bd89c921ae4c8169b2182985c11..db4d5cb4389712983886033be675d7210b1ea4a0 100644 (file)
--- a/lily/accidental-placement.cc
+++ b/lily/accidental-placement.cc
@@ -37,7 +37,6 @@ Accidental_placement::alignment_callback(SCM s, SCM )
 }
 
 
-
 void
 Accidental_placement::add_accidental (Grob* me, Grob* a)
 {

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index 66c65cd5243f10e0f0616dcbf7dc513c9ef173ba..5af41dbe56e3116351622ce13ed507e3cd595a30 100644 (file)
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -84,7 +84,7 @@ mkdir -p $RPM_BUILD_ROOT/etc/profile.d
 cp buildscripts/out/lilypond-profile $RPM_BUILD_ROOT/etc/profile.d/lilypond.sh
 cp buildscripts/out/lilypond-login $RPM_BUILD_ROOT/etc/profile.d/lilypond.csh
 
-make prefix="$RPM_BUILD_ROOT%{_prefix}" install-html-doc
+make prefix="$RPM_BUILD_ROOT%{_prefix}" webdir="$RPM_BUILD_ROOT%{_prefix}/share/doc/lilypond/" out=www web-install
 
 
 %post
@@ -138,13 +138,13 @@ scrollkeeper-update
 %{_bindir}/pmx2ly
 
 %doc buildscripts/out/convert-new-chords
-%doc NEWS
 %doc THANKS
 %doc COPYING
 %doc DEDICATION
 %doc README.txt
 %doc AUTHORS.txt
 %doc INSTALL.txt
+%doc NEWS.txt
 
 %if %{info}
 %{_infodir}/*
@@ -174,7 +174,7 @@ scrollkeeper-update
 
 %defattr(-, root, root)
 
-%{docdir}/@TOPLEVEL_VERSION@
+%{docdir}
 %{_datadir}/omf/lilypond/@TOPLEVEL_VERSION@