From: janneke <janneke>
Date: Thu, 24 Jul 2003 11:34:48 +0000 (+0000)
Subject: * stepmake/GNUmakefile.in (STEPMAKE_TEMPLATES):
X-Git-Tag: release/1.7.29~55
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=c75edda7354f939037b2586d665360ad0db03239;p=lilypond.git

* stepmake/GNUmakefile.in (STEPMAKE_TEMPLATES):
* stepmake/stepmake/GNUmakefile (STEPMAKE_TEMPLATES): Add www (why
do we recurse whole tree?).

* GNUmakefile.in (html-doc): Resurrect.

* Documentation/pictures/GNUmakefile (default, local-dist): Remove
obsolete $(package-icon) dependency.
---

diff --git a/ChangeLog b/ChangeLog
index cd91f17acc..e37928fb5f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-07-24  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+	* stepmake/GNUmakefile.in (STEPMAKE_TEMPLATES): 
+	* stepmake/stepmake/GNUmakefile (STEPMAKE_TEMPLATES): Add www (why
+	do we recurse whole tree?).
+
+	* GNUmakefile.in (html-doc): Resurrect.
+
+	* Documentation/pictures/GNUmakefile (default, local-dist): Remove
+	obsolete $(package-icon) dependency.
+
 2003-07-24  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
 	* Documentation/index.html.in: url typo.
diff --git a/Documentation/pictures/GNUmakefile b/Documentation/pictures/GNUmakefile
index 72940f909e..a5210bbd7c 100644
--- a/Documentation/pictures/GNUmakefile
+++ b/Documentation/pictures/GNUmakefile
@@ -10,8 +10,8 @@ OUT_DIST_FILES = $(package-icon)
 
 include $(depth)/make/stepmake.make
 
-default: $(package-icon)
-local-dist: $(package-icon)
+default: # $(package-icon)
+local-dist: # $(package-icon)
 
 xgifs: $(OUTGIF_FILES)
 pngs: $(OUTPNG_FILES)
diff --git a/GNUmakefile.in b/GNUmakefile.in
index a7babd1db2..09830cffe1 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -38,6 +38,7 @@ pfa-fonts:
 	(cd $(builddir)/share/lilypond/fonts && \
 		tar czvf ../../../$(outbase)/type1.tar.gz type1/*.pfa type1/fonts.* type1/lilypond.* )
 
+html-doc: web
 install-html-doc: 
 	$(INSTALL) -m 755 -d $(local_package_docdir) 
 	tar -C $(local_package_docdir)/ -xzf $(outdir)/web.tar.gz
diff --git a/stepmake/stepmake/GNUmakefile b/stepmake/stepmake/GNUmakefile
index 5ccfb5c159..9c4cf823ef 100644
--- a/stepmake/stepmake/GNUmakefile
+++ b/stepmake/stepmake/GNUmakefile
@@ -10,7 +10,7 @@ depth = ..
 SUBDIRS =
 #
 
-STEPMAKE_TEMPLATES=makedir install
+STEPMAKE_TEMPLATES=makedir install www
 
 # bootstrap stepmake:
 #