From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Tue, 30 Sep 2003 09:47:41 +0000 (+0000)
Subject: * Documentation/user/GNUmakefile: Remove bashism (Bertalan Fodor).
X-Git-Tag: release/2.0.2~5
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=8ff3dbdc2b22da7679e4f8e9e3983fb744f1a04d;p=lilypond.git

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

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

diff --git a/ChangeLog b/ChangeLog
index cd60e3104d..14c542cd9b 100644
--- 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 627642e481..669d3dd922 100644
--- 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 3bab957802..3435d1cc1e 100644
--- 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
 }