X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=GNUmakefile.in;h=fb0265a36e9db80362aa45aee927b31d27ffeb65;hb=7fdba78d66205695cc51033baccd7e9178a131d3;hp=3b1a2bca20e27bb4de9269e27f604a109bdc6ed6;hpb=918ed854dd4893789234f1a2e7854f13c0f04070;p=lilypond.git diff --git a/GNUmakefile.in b/GNUmakefile.in index 3b1a2bca20..fb0265a36e 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -22,7 +22,7 @@ TOPDOC_FILES = AUTHORS INSTALL README NEWS TOPDOC_TXT_FILES = $(addprefix $(top-build-dir)/Documentation/topdocs/$(outdir)/,$(addsuffix .txt,$(TOPDOC_FILES))) IN_FILES := $(call src-wildcard,*.in) -EXTRA_DIST_FILES = VERSION .cvsignore .gitignore SConstruct \ +EXTRA_DIST_FILES = VERSION .gitignore SConstruct \ $(README_FILES) $(SCRIPTS) $(IN_FILES) INSTALLATION_DIR=$(local_lilypond_datadir) INSTALLATION_FILES=$(config_make) VERSION @@ -54,6 +54,7 @@ install-WWW: rsync -rl $(outdir)/offline-root/ $(DESTDIR)$(webdir) $(MAKE) -C Documentation/user local-install-WWW $(MAKE) -C Documentation/user install-info + $(MAKE) -C input/lsr install-info install-help2man: $(MAKE) -C scripts man install-help2man @@ -85,7 +86,7 @@ local-WWW-post: $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(outdir)/examples.html input/ find $(outdir) -name '*-root' | xargs rm -rf $(PYTHON) $(buildscript-dir)/www_post.py $(PACKAGE_NAME) $(TOPLEVEL_VERSION) $(buildscript-dir) $(top-build-dir)/Documentation/po/$(outdir) $(outdir) "$(WEB_TARGETS)" - find $(foreach t, $(WEB_TARGETS), $(outdir)/$(t)-root) -type l -delete + find $(outdir)/offline-root -type l -delete tree-prefix = $(outdir) @@ -176,7 +177,7 @@ $(tree-share-prefix)/mf-link-tree link-mf-tree: $(tree-share-prefix)/lilypond-fo -cd $(tree-share-prefix)/fonts/tfm && \ ln -s ../../../../../../mf/$(outconfbase)/*.tfm . -cd $(tree-share-prefix)/fonts/type1 && \ - ln -s ../../../../../../mf/$(outconfbase)/*.pfa . + ln -s ../../../../../../mf/$(outconfbase)/*.pf? . TAGS.make: dummy etags -o $@ $(find $(top-src-dir) -name 'GNUmakefile*' -o -name '*.make') @@ -209,7 +210,7 @@ test: $(MAKE) -C input/regression/musicxml out=test local-test test-baseline: - @if test -d .git ; then \ + @if test -d .git ; then \ $(if $(shell git diff), echo "commit before base lining" && false,true) ; \ fi $(MAKE)