* scm/output-tex.scm (comment): idem.

[lilypond.git] / GNUmakefile.in
diff --git a/GNUmakefile.in b/GNUmakefile.in

index 48f4a24b1f81b1cbe32343ca79f06c1a015b028c..8ad5ccc5a63d72ca288a6147510d324b9a44aea8 100644 (file)
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -17,13 +17,13 @@ SUBDIRS = buildscripts python scripts \
  #
  
  SCRIPTS = configure aclocal.m4 autogen.sh
-README_FILES =  ChangeLog  COPYING DEDICATION NEWS README.mandrake ROADMAP THANKS
-README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt
+README_FILES =  ChangeLog  COPYING DEDICATION README.mandrake ROADMAP THANKS
+README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt
  IN_FILES := $(wildcard *.in)
-EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch lexer-gcc-3.0.patch server.el.patch darwin.patch .cvsignore  lexer-gcc-3.1.sh  lilypond.words
+EXTRA_DIST_FILES = $(wildcard *.el) vimrc VERSION $(README_FILES)  $(SCRIPTS) $(IN_FILES)  emacsclient.patch server.el.patch darwin.patch .cvsignore  lexer-gcc-3.1.sh  lilypond.words
  NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES)
  INSTALLATION_DIR=$(local_lilypond_datadir)
-INSTALLATION_FILES=$(configuration) VERSION
+INSTALLATION_FILES=$(config_make) VERSION
  
  # bootstrap stepmake:
  #
@@ -38,9 +38,9 @@ pfa-fonts:
         (cd $(builddir)/share/lilypond/fonts && \
                 tar czvf ../../../$(outbase)/type1.tar.gz type1/*.pfa type1/fonts.* type1/lilypond.* )
  
-install-html-doc: top-web
-       $(INSTALL) -m 755 -d $(local_package_docdir) 
-       tar -C $(local_package_docdir)/ -xzf $(outdir)/web.tar.gz
+web-install: 
+       -$(INSTALL) -m 755 -d $(webdir) 
+       tar -C $(webdir)/ -xzf $(outdir)/web.tar.gz
  
  local-install:
         $(INSTALL) -d $(local_lilypond_datadir)
@@ -54,15 +54,17 @@ final-install:
  
  web-ext = gz html midi pdf png txt ly
  
-local-WWW-post:
-       $(footify) --index=./ `$(FIND) . -maxdepth 1 -name '*.html' -print`
-       $(footify-all-command)
+footify=$(PYTHON) $(step-bindir)/add-html-footer.py  --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION)
+
+local-WWW-post: 
+       $(footify) `$(FIND) $(builddir) -name '*.html' -print`
         cd $(builddir) && rm -f `find . -name \*.html~ -print`
         cd $(builddir) && find Documentation input \
                 $(web-ext:%=-path '*/out-www/*.%' -or) -false \
                 > $(outdir)/weblist
-       echo '<META HTTP-EQUIV="refresh" content="2;URL=Documentation/out-www/">' > $(builddir)/index.html
-       cd $(builddir) && ls *.png *.html >> $(outdir)/weblist
+       echo '<META HTTP-EQUIV="refresh" content="0;URL=Documentation/out-www/index.html">' > $(builddir)/index.html
+       echo '<html><body>Redirecting to the documentation index...</body></html>' >> $(builddir)/index.html
+       cd $(builddir) && ls *.html >> $(outdir)/weblist
         cat $(outdir)/weblist | (cd $(builddir); GZIP=-9v tar -czf $(outdir)/web.tar.gz  -T -)
  
  src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh
@@ -75,8 +77,6 @@ web-clean:
         $(MAKE) out=www clean
  
  
-WWW:
-       $(LOOP)
  
  default: $(config_h) builddir-setup