release commit

diff --git a/ChangeLog b/ChangeLog
index d5b68ddb601bd6c32198c1be874d8c80595798f2..60ff2d8c1686002a7e6f27bef963bc3c22310fed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -143,7 +143,7 @@
 
        * ps/lilyponddefs.ps: Disable PostScript titling.
 
-       * lily/paper-score.cc (process): Qoute PORT argument to make-title.
+       * lily/paper-score.cc (process): Qute PORT argument to make-title.
 
 2004-03-01  Han-Wen Nienhuys   <hanwen@xs4all.nl>
 

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 98e7d316d798d0d61220f57b612234e23d9e1da8..e0cff00614c63a7979523977678fa1266976edd2 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -47,7 +47,10 @@ ifeq ($(out),www)
     $(outdir)/%.info: $(outdir)/%.nexi
 local-install-info: install-info info
        -$(INSTALL) -d $(DESTDIR)$(package_infodir)
-       (cd $(package_infodir) && ln -sf $(local_package_docdir)/Documentation/user/out-www/*png .)
+
+## ugh: can not have absolute symlinks because of buildroot.
+#      (cd $(package_infodir) && ln -sf $(local_package_docdir)/Documentation/user/out-www/*png .)
+
 local-uninstall-WWW:
        rm -f $(package_infodir)/*.png
 else

diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in
index 503b36207356d228091f009af0feac177d3d5c80..0ba1deab1ee3736f1188b1d9ed401d278778a061 100644 (file)
--- a/make/lilypond.redhat.spec.in
+++ b/make/lilypond.redhat.spec.in
@@ -62,24 +62,34 @@ make -C Documentation/user local_package_docdir=%{docdir} omf
 rm -rf $RPM_BUILD_ROOT
 mkdir -p $RPM_BUILD_ROOT/tmp/lilypond-rpm-doc
 
-make prefix="$RPM_BUILD_ROOT%{_prefix}" infodir="$RPM_BUILD_ROOT%{_infodir}"  mandir="$RPM_BUILD_ROOT%{_mandir}" install
-
-%if %{info}
-rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
-gzip -9fn `find $RPM_BUILD_ROOT%{_infodir}/ -name '*.info'`
-%endif
+make prefix="$RPM_BUILD_ROOT%{_prefix}" \
+       infodir="$RPM_BUILD_ROOT%{_infodir}"  \
+       mandir="$RPM_BUILD_ROOT%{_mandir}" install
 
+#emacs
 mkdir -p $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
-# install -m 755 -d  $RPM_BUILD_ROOT/etc/emacs/site-start.d
 install -m 644 elisp/lilypond-init.el  $RPM_BUILD_ROOT%{_datadir}/emacs/site-lisp/site-start.d
 
+#manual pages
 gzip -9fn $RPM_BUILD_ROOT%{_mandir}/man1/*
 
+
+# profile scripts.
 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}" webdir="$RPM_BUILD_ROOT%{_prefix}/share/doc/lilypond/" web-install
+# web doc
+make prefix="$RPM_BUILD_ROOT%{_prefix}" \
+  infodir="$RPM_BUILD_ROOT%{_infodir}"  \
+  webdir="$RPM_BUILD_ROOT%{_prefix}/share/doc/lilypond/" web-install
+
+# info 
+%if %{info}
+rm -f $RPM_BUILD_ROOT/%{_infodir}/dir
+gzip -9fn `find $RPM_BUILD_ROOT%{_infodir}/ -name '*.info'`
+%endif
+
 
 
 %post