X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=6667cc4b2e726dcb48897a340b57213f3ceeaa15;hb=4a449a9403a6981381f185aee0871b584b13c3a6;hp=a7babd1db28efbf7467f084c76f2ed79d7d16f6f;hpb=864e67718a6773763b438bf57a3978a1d225f61a;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index a7babd1db2..6667cc4b2e 100644 --- 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: # @@ -35,12 +35,11 @@ doc: pfa-fonts: $(MAKE) MAKE_PFA_FILES=1 -C mf - (cd $(builddir)/share/lilypond/fonts && \ - tar czvf ../../../$(outbase)/type1.tar.gz type1/*.pfa type1/fonts.* type1/lilypond.* ) +# don't make fontball - we have binary packages for that. -install-html-doc: - $(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,18 +53,24 @@ final-install: web-ext = gz html midi pdf png txt ly -footify=$(PYTHON) $(step-bindir)/add-html-footer.py --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION) +footify = MAILADDRESS=bug-lilypond@gnu.org $(PYTHON) $(step-bindir)/add-html-footer.py --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION) -local-web-post: - $(footify) `$(FIND) . -name '*.html' -print` +bla: + cd $(builddir) && $(footify) `$(FIND) . -name '*.html' -print` + +local-WWW-post: + $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/examples.html ./ + cd $(builddir) && $(footify) `$(FIND) . -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 '' > $(builddir)/index.html + echo '' > $(builddir)/index.html + echo 'Redirecting to the documentation index...' >> $(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 ALL-TAGS: @@ -74,7 +79,7 @@ ALL-TAGS: web-clean: $(SHELL) $(buildscript-dir)/clean-fonts.sh $(MAKE) out=www clean - + $(MAKE) $(builddir)/share/lilypond-force default: $(config_h) builddir-setup @@ -133,3 +138,10 @@ $(config_h): configure.in aclocal.m4 @echo ' rm $(config_h); ./autogen.sh' @echo @false + + +# maybe move into private script? +rsync-web: + cd out-www && mkdir web && tar -xzf web.tar.gz -C web + cd out-www/web && rsync --delete --stats --progress -rltvu -e ssh . x:/var/www/lilypond/doc/v1.9/ + cd out-www && rm -rf web/