From d0f908deb91ef96cc03cd77a198571d2b97dda40 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Tue, 29 Nov 2005 00:25:41 +0000
Subject: [PATCH] *** empty log message ***
---
ChangeLog | 12 ++++++++++++
Documentation/user/GNUmakefile | 4 ++--
GNUmakefile.in | 6 +++---
make/lilypond.fedora.spec.in | 4 ++--
4 files changed, 19 insertions(+), 7 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index cde4eafd51..fdbef5059d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-11-29 Han-Wen Nienhuys <hanwen@xs4all.nl>
+
+ * scripts/*.py: gmane address for bugs.
+
+2005-11-28 Pal Benko <benkop@freestart.hu>
+
+ * make/ly-rules.make: add -f switch to mv
+
+ * scm/output-libs.scm: add new bar symbol "." for punctus divisionis
+
+ * lily/bar-line.cc: interpret it
+
2005-11-28 Jan Nieuwenhuizen <janneke@gnu.org>
* configure.in (--disable-documentation): New switch.
diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index b8d54e41bc..6ab1df325b 100644
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -71,14 +71,14 @@ ifneq ($(patsubst %/local,%,$(DESTDIR)$(prefix)),/usr)
@echo
@echo "For images in the INFO docs to work, do: "
@echo
- @echo " (cd $(package_infodir) && ln -sf ../../doc/lilypond/Documentation/user/out-www/*png .)"
+ @echo " (cd $(package_infodir) && ln -sf ../../doc/lilypond/Documentation/user/*png .)"
@echo "or add something like that to the postinstall script."
@echo
else
-$(INSTALL) -d $(DESTDIR)$(package_infodir)
-install-info --remove --info-dir=$(infodir) $(outdir)/lilypond.info
install-info --info-dir=$(infodir) $(outdir)/lilypond.info
- (cd $(package_infodir) && ln -sf $(webdir)/Documentation/user/out-www/*png .)
+ (cd $(package_infodir) && ln -sf $(webdir)/Documentation/user/*png .)
endif
local-uninstall-WWW:
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 6001bd3870..7da071d5ce 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -35,9 +35,9 @@ doc:
$(MAKE) -C Documentation
install-WWW:
- -$(INSTALL) -m 755 -d $(DESTDIR)$(webdir)
- tar -C $(webdir)/ -xzf $(outdir)/web.tar.gz
-# install-WWW does not recurse; fake it visiting Documentation/user manually
+ -$(INSTALL) -m 755 -d $(DESTDIR)$(webdir)
+ cp -a $(outdir)/web-root/ $(DESTDIR)$(webdir)/
+
$(MAKE) -C Documentation/user local-install-WWW
$(MAKE) -C Documentation/user install-info
diff --git a/make/lilypond.fedora.spec.in b/make/lilypond.fedora.spec.in
index 1744e67654..a3cc400a61 100644
--- a/make/lilypond.fedora.spec.in
+++ b/make/lilypond.fedora.spec.in
@@ -39,7 +39,7 @@ Group: Applications/Publishing
%description documentation
Documentation and example files of LilyPond. An index is available at
-%{docdir}/web/Documentation/out-www/index.html
+%{docdir}/web/Documentation/index.html
%prep
%setup
@@ -86,7 +86,7 @@ make prefix="$RPM_BUILD_ROOT%{_prefix}" \
infodir="$RPM_BUILD_ROOT%{_infodir}" \
webdir="$RPM_BUILD_ROOT%{_prefix}/share/doc/lilypond/" web-install
-ln -sf ../../doc/lilypond/Documentation/user/out-www/*png $RPM_BUILD_ROOT%{_infodir}/lilypond/
+ln -sf ../../doc/lilypond/Documentation/user/*png $RPM_BUILD_ROOT%{_infodir}/lilypond/
# info
%if %{info}
--
2.39.5