* 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/ChangeLog b/ChangeLog
index 033214bf3fe35bf8b79362127ea1d15f245bbbfe..56d9ea93cf0e79ee938c64a2c22de12ce89c530e 100644 (file)
--- 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 238c4a1674eb2d9cc15880578298a8fe4dc7a53a..9dc10dc2aa913f966d31568205bb518d70a80099 100644 (file)
--- 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 f6e334cd14760420461e7485d5c694a5eb8e01d4..72362dc6cdf41797e85d4d0681946985226bd5af 100644 (file)
--- 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 5238a31b15456457c460a472120baa3f4db4f7cf..1c42d31020676f9b92a0cf5da29257d1e133111b 100644 (file)
--- 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 d830d1268dc6fcb47daf884c3ee853a64ca565da..01a63013defcacb1b41262b3310bf39160d7dfe7 100644 (file)
--- 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 7f1e8349574437c7d22ccdd21329257d02d4ec61..6495bf673f95975a46617a183a7efbf9c479fd90 100644 (file)
--- 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):