X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=21681b64ccdf5a553134aeba4bca0223cd9de3ef;hb=19c35ecafd1febb9350eff2f9a1ec8585dcde26c;hp=8e828f3b95fd0ac42c7deb20dd3349691b61de01;hpb=2cbcbf648d871418f90d823d051a9785a74eb10e;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 8e828f3b95..21681b64cc 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -57,7 +57,7 @@ local-install: final-install: @true -web-ext = html midi pdf png txt ly +web-ext = html midi pdf png txt ly signature footify = $(PYTHON) $(step-bindir)/add-html-footer.py --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION) footifymail = MAILADDRESS='http://post.gmane.org/post.php?group=gmane.comp.gnu.lilypond.bugs' @@ -72,37 +72,27 @@ local-WWW-post: echo 'Redirecting to the documentation index...' >> $(outdir)/index.html cd $(top-build-dir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify) - cd $(top-build-dir) && find . -name \*.html~ -print | xargs rm -f - cd $(top-build-dir) && find Documentation input \ - $(web-ext:%=-path '*/out-www/*.%' -or) -type l \ - > $(outdir)/weblist - cd $(top-build-dir) && find Documentation input \ - -path '*/out-www/*.signature' \ - > $(outdir)/siglist - ls $(outdir)/*.html >> $(outdir)/weblist ## rewrite file names so we lose out-www - rm -rf $(outdir)/web-root/ - mkdir $(outdir)/web-root/ $(outdir)/web-signature-root/ - cat $(outdir)/weblist | (cd $(top-build-dir); tar -cf- -T- ) | \ - tar -C $(outdir)/web-root/ -xf - - cat $(outdir)/siglist | (cd $(top-build-dir); tar -cf- -T- ) | \ - tar -C $(outdir)/web-signature-root/ -xf - - for dir in $(outdir)/web-root/ $(outdir)/web-signature-root/ ; do \ - cd $$dir && \ - for a in `find . -name out-www`; do \ - rsync -a --link-dest $$a/ $$a/ $$a/.. ; \ - rm -rf $$a ; \ - done \ + rm -rf $(outdir)/web-root/ + for d in out-www `cd $(top-build-dir) && find Documentation input -name 'out-www' `; do \ + echo $$d ; \ + (mkdir -p $(outdir)/web-root/$$d/ || true) ; \ + rsync -Wa --include source --include music-glossary \ + --include lilypond-internals \ + --include lilypond \ + $(foreach pat,$(web-ext), --include '*'.$(pat)) $(top-build-dir)/$$d/ $(outdir)/web-root/$$d/../ ; \ done - echo $(TOPLEVEL_VERSION) > $(outdir)/web-root/VERSION + echo $(TOPLEVEL_VERSION)> $(outdir)/web-root/VERSION tree-prefix = $(outdir) tree-bin = $(tree-prefix)/bin tree-lib = $(tree-prefix)/lib tree-share = $(tree-prefix)/share -tree-share-prefix = $(tree-share)/lilypond/current -tree-lib-prefix = $(tree-lib)/lilypond/current +tree-share-prefix = $(tree-share)/lilypond/$(TOPLEVEL_VERSION) +tree-share-prefix-current = $(tree-share)/lilypond/current +tree-lib-prefix = $(tree-lib)/lilypond/$(TOPLEVEL_VERSION) +tree-lib-prefix-current = $(tree-lib)/lilypond/current C_DIRS = flower lily c-clean: @@ -127,7 +117,9 @@ $(tree-share-prefix)/lilypond-force link-tree: GNUmakefile cd $(top-build-dir)/$(outbase) && rm -rf bin lib share mkdir -p $(tree-bin) mkdir -p $(tree-share-prefix) + ln -s $(TOPLEVEL_VERSION) $(tree-share-prefix-current) mkdir -p $(tree-lib-prefix) + ln -s $(TOPLEVEL_VERSION) $(tree-lib-prefix-current) mkdir -p $(tree-share-prefix)/dvips mkdir -p $(tree-share-prefix)/elisp mkdir -p $(tree-share-prefix)/fonts @@ -182,11 +174,16 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo -cd $(tree-share-prefix)/fonts/type1 && \ ln -s ../../../../../../mf/$(outconfbase)/*.pfa . - TAGS.make: dummy etags -o $@ $(find $(srcdir) -name 'GNUmakefile*' -o -name '*.make') -local-clean: build-dir-setup-clean +local-clean: build-dir-setup-clean local-web-clean + +local-web-clean: + rm -rf $(outdir)/web-root/ + + + build-dir-setup-clean: cd $(top-build-dir) && rm -rf share