Update documentation targets

[lilypond.git] / Documentation / user / GNUmakefile

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 0bf8330bc77aac8637dd0efa724dcdc83277a697..237bb973a0426517d90417ba6d9d87ca75953f66 100644 (file)
--- a/Documentation/user/GNUmakefile
+++ b/Documentation/user/GNUmakefile
@@ -29,11 +29,10 @@ MAIN_INFO_DOC = lilypond
 INFO_DOCS = lilypond lilypond-internals music-glossary lilypond-program lilypond-learning
 INFO_FILES = $(INFO_DOCS:%=$(outdir)/%.info)
 
-DOCUMENTATION_INCLUDES = \
+TEXI2PDF_FLAGS = \
+  -I $(outdir) \
   -I $(top-src-dir)/Documentation/user \
-  -I $(top-build-dir)/Documentation/user/$(outdir)
-
-TEXI2PDF_FLAGS = $(DOCUMENTATION_INCLUDES)
+  -I $(top-build-dir)/Documentation/user/$(outconfbase)
 
 ifeq ($(out),www)
 INFO_IMAGES_DIR = lilypond
@@ -123,9 +122,11 @@ $(outdir)/%/source:
        mkdir -p $(dir $@)
        ln -sf $(depth)/.. $(@)
 
+ifeq ($(out),www)
 local-WWW-1: $(MASTER_TEXI_FILES) $(PDF_FILES) info
 
 local-WWW-2: $(HTML_FILES) $(DEEP_HTML_FILES) $(source-links)
+endif
 
 $(outdir)/%.bib: %.bib
        ln -f $< $@