X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=e5f9f0cdf57cee69535bf51e3e08c530462815fc;hb=c809e16201118481b65c1aa4ad986715f804288e;hp=345bdf02f8365ebfba722dafce7b5eb8db5c8b32;hpb=7aef538431a3e242325aee42b9e073b9146f5c94;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 345bdf02f8..e5f9f0cdf5 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 \ @@ -18,11 +18,11 @@ SUBDIRS = buildscripts python scripts \ vim # -include VERSION -package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'` +#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 @@ -41,7 +41,7 @@ doc: $(MAKE) -C Documentation install-WWW: - -$(INSTALL) -m 755 -d $(webdir) + -$(INSTALL) -m 755 -d $(DESTDIR)$(webdir) tar -C $(webdir)/ -xzf $(outdir)/web.tar.gz # install-WWW does not recurse; fake it visiting Documentation/user manually $(MAKE) -C Documentation/user local-install-WWW @@ -57,89 +57,107 @@ web-uninstall: $(MAKE) out=www uninstall-WWW= local-install: - $(INSTALL) -d $(local_lilypond_datadir) + $(INSTALL) -d $(DESTDIR)$(local_lilypond_datadir) final-install: - @echo '*** Before using LilyPond, the contents of one of the login scripts' - @echo '*** buildscripts/out/lilypond-{profile,login} should be sourced.' - @echo '*** LilyPond should have been installed to do that automatically' - @echo '*** when you log in. So, please log out now and log in again.' - @echo '*** For more information see Invoking LilyPond in the manual.' + @true -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 local-WWW-post: +# need UTF8 setting in case this is hosted on a website. + echo -e 'AddDefaultCharset utf-8\nAddCharset utf-8 .html\nAddCharset utf-8 .en\nAddCharset utf-8 .nl\nAddCharset utf-8 .txt\n' > $(builddir)/.htaccess $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/examples.html ./ cd $(builddir) && $(FIND) . -name '*.html' -print | $(footifymail) xargs $(footify) cd $(builddir) && find . -name \*.html~ -print | xargs rm -f cd $(builddir) && find Documentation input \ - $(web-ext:%=-path '*/out-www/*.%' -or) -false \ + $(web-ext:%=-path '*/out-www/*.%' -or) -type l \ > $(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 -) +share-prefix = $(builddir)/share +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 link-tree: 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)/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)/fonts/otf + mkdir -p $(tree-prefix)/fonts/tfm + mkdir -p $(tree-prefix)/fonts/type1 + mkdir -p $(tree-prefix)/fonts/svg + mkdir -p $(tree-prefix)/fonts/map + mkdir -p $(tree-prefix)/fonts/enc + 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) dvips && \ - ln -s ../../mf/$(outconfbase) afm && \ - 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)/tex && \ + 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 $(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/enc && \ + ln -s ../../../../../mf/$(outconfbase)/*.enc . + cd $(tree-prefix)/fonts/map && \ + ln -s ../../../../../mf/$(outconfbase)/*.map . + cd $(tree-prefix)/fonts/otf && \ + ln -s ../../../../../mf/$(outconfbase)/*.otf . + cd $(tree-prefix)/fonts/svg && \ + ln -s ../../../../../mf/$(outconfbase)/*.svg . + cd $(tree-prefix)/fonts/tfm && \ + ln -s ../../../../../mf/$(outconfbase)/*.tfm . + cd $(tree-prefix)/fonts/type1 && \ + ln -s ../../../../../mf/$(outconfbase)/*.pfa . + cd $(tree-prefix)/fonts && \ ln -s $(abs-srcdir)/mf source && \ - ln -s ../../../mf/$(outconfbase) afm && \ - ln -s ../../../mf/$(outconfbase) tfm && \ - ln -s ../../../mf/$(outconfbase) type1 - cd $(builddir)/share/$(package)/elisp && \ - ln -sf ../../../elisp/$(outconfbase)/lilypond-words.el . && \ + true + 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 - touch $@ + mkdir -p $(share-prefix)/locale/$i/LC_MESSAGES && \ + cd $(share-prefix)/locale/$i/LC_MESSAGES && \ + ln -sf ../../../../po/$(outconfbase)/$i.mo lilypond.mo &&) true +# touch $@ + touch $(tree-prefix)/lilypond-force local-clean: builddir-setup-clean builddir-setup-clean: cd $(builddir) && rm -rf share -$(config_h): config.hh.in +$(config_h): config.hh.in # # this is to prevent people from getting # undefined symbols when we add them to config.h.in,