From 583dccc119fc96fcce4d813784ca0af8c57a41da Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Thu, 7 Aug 2003 08:54:26 +0000
Subject: [PATCH] * GNUmakefile.in (local-WWW-post): footify build fix.

* configure.in: require GUILE 1.6.4

* Documentation/user/GNUmakefile: don't copy *.png for
lilypond-internals

* GNUmakefile.in (local-WWW-post): move mutopia-index to toplevel
local-WWW-post target.
(rsync-web): add rsync-web target
---
 ChangeLog                       | 7 +++++++
 Documentation/topdocs/NEWS.texi | 2 ++
 Documentation/user/GNUmakefile  | 1 -
 GNUmakefile.in                  | 7 +++++--
 configure.in                    | 2 +-
 stepmake/bin/add-html-footer.py | 6 +++---
 6 files changed, 18 insertions(+), 7 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 033214bf3f..56d9ea93cf 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2003-08-07  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* GNUmakefile.in (local-WWW-post): footify build fix.
+
+	* configure.in: require GUILE 1.6.4
+
+	* Documentation/user/GNUmakefile: don't copy *.png for
+	lilypond-internals
+
 	* GNUmakefile.in (local-WWW-post): move mutopia-index to toplevel
 	local-WWW-post target.
 	(rsync-web): add rsync-web target
diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index 238c4a1674..9dc10dc2aa 100644
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -100,6 +100,8 @@ The syntax for this feature is
 @example
 	\applyoutput #SCHEME-FUNCTION
 @end example
+
+@noindent
 SCHEME-FUNCTION takes a single argument, and is called for every grob
 that is created in the current context.
 
diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index f6e334cd14..72362dc6cd 100644
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -76,7 +76,6 @@ $(outdir)/lilypond-internals/lilypond-internals.html: $(outdir)/lilypond-interna
 	mkdir -p $(dir $@)
 	$(MAKEINFO) --output=$(outdir)/lilypond-internals --html $<
 	$(MAKEINFO) -I $(outdir) --output=$@ --html --no-split --no-headers $<
-	-cp -f $(outdir)/*.{png,ly} $(outdir)/lilypond-internals
 
 ifeq ($(SPLITTING_MAKEINFO),yes)
 
diff --git a/GNUmakefile.in b/GNUmakefile.in
index 5238a31b15..1c42d31020 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -54,11 +54,14 @@ final-install:
 
 web-ext = gz html midi pdf png txt ly
 
-footify=$(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
+footify = MAILADDRESS=bug-lilypond@gnu.org  $(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
+
+bla:
+	cd $(builddir) && $(footify) `$(FIND) . -name '*.html' -print`
 
 local-WWW-post:  
 	$(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/examples.html ./
-	$(footify) `$(FIND) $(builddir) -name '*.html' -print`
+	cd $(builddir) && $(footify) `$(FIND) . -name '*.html' -print`
 	cd $(builddir) && rm -f `find . -name \*.html~ -print`
 	cd $(builddir) && find Documentation input \
 		$(web-ext:%=-path '*/out-www/*.%' -or) -false \
diff --git a/configure.in b/configure.in
index d830d1268d..01a63013de 100644
--- a/configure.in
+++ b/configure.in
@@ -39,7 +39,7 @@ STEPMAKE_GETTEXT
 STEPMAKE_MSGFMT(REQUIRED)
 STEPMAKE_TEXMF
 STEPMAKE_TEXMF_DIRS
-STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6)
+STEPMAKE_GUILE_DEVEL(REQUIRED, 1.6.4)
 STEPMAKE_KPATHSEA
 STEPMAKE_MAKEINFO(REQUIRED)
 STEPMAKE_PYTHON_DEVEL(REQUIRED)
diff --git a/stepmake/bin/add-html-footer.py b/stepmake/bin/add-html-footer.py
index 7f1e834957..6495bf673f 100644
--- a/stepmake/bin/add-html-footer.py
+++ b/stepmake/bin/add-html-footer.py
@@ -40,10 +40,10 @@ of @PACKAGE_NAME@
 
 built = r"""<hr>
 <p><font size="-1">
-This page was built from @PACKAGE_NAME@-@PACKAGE_VERSION@ (@BRANCH@) by<br>
+This page is for @PACKAGE_NAME@-@PACKAGE_VERSION@ (@BRANCH@). <br>
 </font>
-<address><font size="-1">@GCOS@ &lt;<a href="mailto:@MAILADDRESS@">@MAILADDRESS@</a>&gt;,
-@LOCALTIME@.</font></address>"""
+<address><font size="-1">
+Report errors to &lt;<a href="mailto:@MAILADDRESS@">@MAILADDRESS@</a>&gt;</font></address>"""
 
 
 def gulp_file (f):
-- 
2.39.2