X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=GNUmakefile.in;h=57ad0d9528a663be4c55260830ff52b2e5cc4bb2;hb=c64ea487b74396f5fd655b55a39c6a0371923b72;hp=6144df461511c73986ae270c2e3ae391e78b8b76;hpb=a61bd357aa25a0bec314736a881550830706d5ae;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 6144df4615..57ad0d9528 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -10,7 +10,7 @@ depth = . # SUBDIRS = buildscripts python scripts \ elisp \ - flower lily \ + flower kpath-guile ttftool lily \ mf ly tex ps scm \ po make \ cygwin debian stepmake \ @@ -21,8 +21,8 @@ SUBDIRS = buildscripts python scripts \ include VERSION package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'` -SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh -README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS +SCRIPTS = configure aclocal.m4 autogen.sh lexer-gcc-3.1.sh Doxyfile +README_FILES = ChangeLog COPYING DEDICATION ROADMAP THANKS HACKING README_TXT_FILES = AUTHORS.txt README.txt INSTALL.txt NEWS.txt IN_FILES := $(wildcard *.in) PATCH_FILES = emacsclient.patch server.el.patch darwin.patch @@ -66,7 +66,7 @@ final-install: @echo '*** when you log in. So, please log out now and log in again.' @echo '*** For more information see Invoking LilyPond in the manual.' -web-ext = gz html midi pdf png txt ly +web-ext = html midi pdf png txt ly footify = $(PYTHON) $(step-bindir)/add-html-footer.py --name $(PACKAGE_NAME) --version $(TOPLEVEL_VERSION) footifymail = MAILADDRESS=bug-lilypond@gnu.org @@ -80,64 +80,67 @@ local-WWW-post: > $(outdir)/weblist 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 -) +tree-prefix = $(builddir)/share/lilypond/$(TOPLEVEL_VERSION) src-ext = c cc yy ll hh icc py scm tex ps texi itexi tely itely sh web-clean: $(MAKE) out=www clean - $(MAKE) $(builddir)/share/lilypond-force + $(MAKE) $(tree-prefix)/lilypond-force default: $(config_h) builddir-setup -builddir-setup: $(builddir)/share/lilypond-force +builddir-setup: $(tree-prefix)/lilypond-force PO_FILES = $(wildcard $(srcdir)/po/*.po) HELP_CATALOGS = $(PO_FILES:$(srcdir)/po/%.po=%) CATALOGS = $(HELP_CATALOGS:lilypond=) -$(builddir)/share/lilypond-force: +$(tree-prefix)/lilypond-force: GNUmakefile # Preparing LilyPond tree for builddir exec cd $(builddir) && rm -rf lib share mkdir -p $(builddir)/lib/$(package) - mkdir -p $(builddir)/share/$(package) - mkdir -p $(builddir)/share/$(package)/dvips - mkdir -p $(builddir)/share/$(package)/elisp - mkdir -p $(builddir)/share/$(package)/fonts - mkdir -p $(builddir)/share/$(package)/tex - cd $(builddir)/lib/$(package) && \ - ln -s ../../python/$(outconfbase) python - cd $(builddir)/share/$(package) && \ + mkdir -p $(tree-prefix) + mkdir -p $(tree-prefix)/dvips + mkdir -p $(tree-prefix)/elisp + mkdir -p $(tree-prefix)/fonts + mkdir -p $(tree-prefix)/tex + cd $(builddir)/lib && \ + ln -s ../../../python/$(outconfbase) python + cd $(tree-prefix) && \ ln -s $(abs-srcdir)/ly ly && \ - ln -s ../../mf/$(outconfbase) otf && \ - ln -s ../../mf/$(outconfbase) svg && \ - ln -s ../../mf/$(outconfbase) tfm && \ + ln -s ../../../mf/$(outconfbase) otf && \ + ln -s ../../../mf/$(outconfbase) svg && \ + ln -s ../../../mf/$(outconfbase) tfm && \ ln -s $(abs-srcdir)/mf && \ ln -s $(abs-srcdir)/ps && \ - ln -s ../../python/$(outconfbase) python && \ - ln -s $(abs-srcdir)/scm - cd $(builddir)/share/$(package)/dvips && \ - ln -s ./../mf/$(outconfbase) mf-out && \ + ln -s ../../../python/$(outconfbase) python && \ + ln -s $(abs-srcdir)/scm && \ + ln -s $(abs-srcdir)/scripts scripts + cd $(tree-prefix)/dvips && \ + ln -s ./../../mf/$(outconfbase) mf-out && \ ln -s $(abs-srcdir)/ps - cd $(builddir)/share/$(package)/tex && \ + cd $(tree-prefix)/tex && \ ln -s $(abs-srcdir)/tex source && \ - ln -s ../../../tex/$(outconfbase) tex-out && \ - ln -s ../../../mf/$(outconfbase) mf-out - cd $(builddir)/share/$(package)/fonts && \ + ln -s ../../../../tex/$(outconfbase) tex-out && \ + ln -s ../../../../mf/$(outconfbase) mf-out + cd $(tree-prefix)/fonts && \ ln -s $(abs-srcdir)/mf source && \ - ln -s ../../../mf/$(outconfbase) otf && \ - ln -s ../../../mf/$(outconfbase) tfm && \ - ln -s ../../../mf/$(outconfbase) svg && \ - ln -s ../../../mf/$(outconfbase) type1 - cd $(builddir)/share/$(package)/elisp && \ - ln -sf ../../../elisp/$(outconfbase)/lilypond-words.el . && \ + ln -s ../../../../tex/$(outconfbase) enc && \ + ln -s ../../../../mf/$(outconfbase) map && \ + ln -s ../../../../mf/$(outconfbase) otf && \ + ln -s ../../../../mf/$(outconfbase) tfm && \ + ln -s ../../../../mf/$(outconfbase) svg && \ + ln -s ../../../../mf/$(outconfbase) type1 + cd $(tree-prefix)/elisp && \ + ln -sf ../../../../../elisp/$(outconfbase)/lilypond-words.el . && \ ln -s $(abs-srcdir)/elisp/*.el . $(foreach i,$(CATALOGS), \ - mkdir -p $(builddir)/share/locale/$i/LC_MESSAGES && \ - cd $(builddir)/share/locale/$i/LC_MESSAGES && \ - ln -fs ../../../../po/$(outconfbase)/$i.mo lilypond.mo &&) true + mkdir -p $(tree-prefix)/locale/$i/LC_MESSAGES && \ + cd $(tree-prefix)/locale/$i/LC_MESSAGES && \ + ln -sf ../../../../../po/$(outconfbase)/$i.mo lilypond.mo &&) true touch $@ local-clean: builddir-setup-clean