* 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 cd91f17acc5f1a13cda0d8d27ed38fecef3bfd52..e37928fb5fb0347e614419ada78feb82387d0706 100644 (file)
--- 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 72940f909e35f41a942c0fed2bff26815fa0e0bd..a5210bbd7c0f43da23c867e3ed40e9520db306f9 100644 (file)
--- 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 a7babd1db28efbf7467f084c76f2ed79d7d16f6f..09830cffe143869e96592837fb17991204894bb2 100644 (file)
--- 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 5ccfb5c1592283fe2f413c8ca61d4955cccc2790..9c4cf823ef299e8ebd80ad8be20e124fe39180a0 100644 (file)
--- 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:
 #