Merge commit 'origin/dev/jneeman' into systems-per-page

[lilypond.git] / Documentation / user / GNUmakefile

diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile
index 0bf8330bc77aac8637dd0efa724dcdc83277a697..6e0dbe3a56aa830af3f47bd78af35f1b9af1cbda 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