X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=make%2Flysdoc-targets.make;h=547614cbd5164842da94832aa7123a841e51fe02;hb=HEAD;hp=28b84beee2c6616260584b6fe3fbd222f2bc4f75;hpb=177f55e3f3d7c6b4613e3d54adeb48d8378b5a56;p=lilypond.git

diff --git a/make/lysdoc-targets.make b/make/lysdoc-targets.make
index 28b84beee2..547614cbd5 100644
--- a/make/lysdoc-targets.make
+++ b/make/lysdoc-targets.make
@@ -1,8 +1,8 @@
+ifeq ($(out),www)
+local-WWW-1: $(outdir)/collated-files.texi $(outdir)/collated-files.pdf
 
-
-local-WWW: $(outdir)/collated-files.html $(outdir)/collated-files.pdf
-
-#.PRECIOUS: $(outdir)/$(NAME).texi
+local-WWW-2: $(outdir)/collated-files.html
+endif
 
 local-test-baseline:
 	rm -rf $(outdir)-baseline
@@ -12,10 +12,14 @@ local-test:
 	rm -f $(outdir)/collated-files.html
 	if test -d $(top-src-dir)/.git  ; then \
 		echo -e 'HEAD is:\n\n\t' ; \
-		git log --max-count=1 --pretty=oneline ;\
+		(cd $(top-src-dir) && git log --max-count=1 --pretty=oneline ) ;\
 		echo -e '\n\n\n' ; \
-		git diff ; \
+		(cd $(top-src-dir) && git diff ) ; \
 	fi > $(outdir)/tree.gittxt
-	$(MAKE) LILYPOND_BOOK_LILYPOND_FLAGS="-dbackend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-lily-fonts --header=texidoc -I $(top-src-dir)/input/manual -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_VERBOSE= $(outdir)/collated-files.html
+ifeq ($(USE_EXTRACTPDFMARK),yes)
+	$(MAKE) LILYPOND_BOOK_LILYPOND_FLAGS="-dbackend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-fonts --header=texidoc -I $(top-src-dir)/Documentation/included/ -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1 -dfont-export-dir=$(top-build-dir)/out-fonts -dgs-never-embed-fonts" LILYPOND_BOOK_WARN= $(outdir)/collated-files.html LYS_OUTPUT_DIR=$(top-build-dir)/out/lybook-testdb
+else
+	$(MAKE) LILYPOND_BOOK_LILYPOND_FLAGS="-dbackend=eps --formats=ps $(LILYPOND_JOBS) -dseparate-log-files -dinclude-eps-fonts -dgs-load-lily-fonts --header=texidoc -I $(top-src-dir)/Documentation/included/ -ddump-profile -dcheck-internal-types -ddump-signatures -danti-alias-factor=1" LILYPOND_BOOK_WARN= $(outdir)/collated-files.html LYS_OUTPUT_DIR=$(top-build-dir)/out/lybook-testdb
+endif
 	rsync -L -a --exclude 'out-*' --exclude 'out' --exclude mf --exclude source --exclude mf $(top-build-dir)/out/share $(outdir)