From 63d59d36d42662d47b9bcacefded0828e4235822 Mon Sep 17 00:00:00 2001
From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 15 Aug 2007 10:41:19 +0200
Subject: [PATCH] Add topdocs/INSTALL that includes install.itely.  Fixes
 distribution of toplevel INSTALL instructions.

---
 Documentation/topdocs/GNUmakefile   | 2 ++
 Documentation/user/install.itely    | 4 ----
 GNUmakefile.in                      | 2 +-
 make/doclang-targets.make           | 2 +-
 stepmake/stepmake/texinfo-vars.make | 3 ++-
 5 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/Documentation/topdocs/GNUmakefile b/Documentation/topdocs/GNUmakefile
index 47938ee182..548636fdf5 100644
--- a/Documentation/topdocs/GNUmakefile
+++ b/Documentation/topdocs/GNUmakefile
@@ -7,6 +7,8 @@ HTML_FILES=$(TEXI_FILES:%.texi=$(outdir)/%.html) $(TELY_FILES:%.tely=$(outdir)/%
 PDF_FILES=$(outdir)/NEWS.pdf
 include $(depth)/make/stepmake.make
 
+MAKEINFO_FLAGS += -I $(top-src-dir)/Documentation/user
+
 ifneq ($(out),www)
 LILYPOND_BINARY='true'
 endif
diff --git a/Documentation/user/install.itely b/Documentation/user/install.itely
index 316dc596b4..107a09f443 100644
--- a/Documentation/user/install.itely
+++ b/Documentation/user/install.itely
@@ -7,10 +7,6 @@
     version that you are working on.  See TRANSLATION for details.
 @end ignore
 
-@c was "INSTALL - compiling and installing GNU LilyPond"
-@node Install
-@chapter Install
-
 @c  I don't know what this comment does.  Remove?  -gp
 @ignore
 @h tml
diff --git a/GNUmakefile.in b/GNUmakefile.in
index f4c6073c45..5e49a0c803 100644
--- a/GNUmakefile.in
+++ b/GNUmakefile.in
@@ -18,7 +18,7 @@ documentation-dir=$(if $(findstring no,$(DOCUMENTATION)),,Documentation)
 
 SCRIPTS = configure autogen.sh 
 README_FILES = COPYING DEDICATION ROADMAP THANKS HACKING
-TOPDOC_FILES = AUTHORS README NEWS
+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)
 
diff --git a/make/doclang-targets.make b/make/doclang-targets.make
index 766046901a..7e9b7ed740 100644
--- a/make/doclang-targets.make
+++ b/make/doclang-targets.make
@@ -12,7 +12,7 @@ default:
 
 $(outdir)/%.nexi: $(ITELY_FILES) $(ITEXI_FILES)
 
-MAKEINFO = LANG= $(MAKEINFO_PROGRAM) --enable-encoding --force
+MAKEINFO_FLAGS += --force
 
 $(outdir)/%/index.html: $(outdir)/%.nexi $(outdir)/user-ln doc-po
 	mkdir -p $(dir $@)
diff --git a/stepmake/stepmake/texinfo-vars.make b/stepmake/stepmake/texinfo-vars.make
index 30451cef6f..534e591ae4 100644
--- a/stepmake/stepmake/texinfo-vars.make
+++ b/stepmake/stepmake/texinfo-vars.make
@@ -11,7 +11,8 @@ GENERATE_OMF = $(PYTHON) $(buildscript-dir)/texi2omf.py --format $(1) --location
 
 TEXINFO_PAPERSIZE_OPTION= $(if $(findstring $(PAPERSIZE),a4),,-t @afourpaper)
 
-MAKEINFO = LANG= $(MAKEINFO_PROGRAM)  --enable-encoding
+MAKEINFO_FLAGS = --enable-encoding
+MAKEINFO = LANG= $(MAKEINFO_PROGRAM) $(MAKEINFO_FLAGS)
 
 
 # info stuff
-- 
2.39.2