* Documentation/user/GNUmakefile: Remove bashism (Bertalan Fodor).

* cygwin/mknetrel (preinstall): Set webdir (Bertalan Fodor).

diff --git a/ChangeLog b/ChangeLog
index cd60e3104d2a8a30bb4cf1b1a4b2a0a9566f2090..14c542cd9bb0cfad29378ce667c055b4d3e61e07 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-30  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       * Documentation/user/GNUmakefile: Remove bashism (Bertalan Fodor).
+
+       * cygwin/mknetrel (preinstall): Set webdir (Bertalan Fodor).
+
 2003-09-29  Jan Nieuwenhuizen  <janneke@gnu.org>
 
        * cygwin/postinstall-lilypond.sh: 

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 627642e4814e690a51e2ab35c29b1a61da350824..669d3dd9224cf370f77673442bc89e0a7401d74a 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -69,7 +69,8 @@ $(outdir)/lilypond/lilypond.html: $(outdir)/lilypond.texi
        mkdir -p $(dir $@)
        $(MAKEINFO) --output=$(outdir)/lilypond --html $<
        $(MAKEINFO) -I $(outdir) --output=$@ --html --no-split --no-headers $<
-       -cp -f $(outdir)/*.{png,ly} $(outdir)/lilypond
+       -cp -f $(outdir)/*.ly $(outdir)/lilypond
+       -cp -f $(outdir)/*.png $(outdir)/lilypond
 
 $(outdir)/lilypond-internals/lilypond-internals.html: $(outdir)/lilypond-internals.texi
        mkdir -p $(dir $@)

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index 3bab9578029a9564c472831f42c5e97ee0f6b35d..3435d1cc1e16db36d9c5167e42f3a6dc9709c52c 100644 (file)
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -123,7 +123,7 @@ preinstall () {
 #    else
     if iscygwin; then
        #EXTRAINSTALLARGS="web-install target=i686-pc-cygwin"
-       addmakeflags web-install
+       addmakeflags webdir="$inst-doc/$packagedocdir" ' ' web-install
     fi
 }