From d6911e7252135fe56a8703f63c9fdd72e75286fc Mon Sep 17 00:00:00 2001
From: Richard Frith-MacDonald <rfm@gnu.org>
Date: Fri, 13 May 2016 19:15:52 +0000
Subject: [PATCH] Another missed patch

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/tools/make/trunk@39758 72102866-910b-0410-8b05-ffd578937521
---
 ChangeLog                        |  3 +++
 Documentation/GNUmakefile        |  2 --
 Instance/Documentation/texi.make | 21 +++++++++++----------
 3 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index e5f891ebc..c8431e1ab 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,9 @@
 	* Instance/framework.make:
 	Forgotten patch to allow multiple versions of a framework to be
 	installed.
+	* Documentation/GNUmakefile:
+	* Instance/Documentation/texi.make:
+	Forgotten patch to update for newere makeinfo which produces html.
 
 2016-05-13 Richard Frith-Macdonald <rfm@gnu.org>
 
diff --git a/Documentation/GNUmakefile b/Documentation/GNUmakefile
index 9ccf2eccd..4a8edad04 100644
--- a/Documentation/GNUmakefile
+++ b/Documentation/GNUmakefile
@@ -167,8 +167,6 @@ include $(GNUSTEP_MAKEFILES)/documentation.make
 
 include ../Version
 
-GNUSTEP_TEXI2HTML_FLAGS += -init_file gnustep.init
-
 # Typing 'make regenerate' should build all, then install the files
 # top-level.  This is mostly for making gnustep-make releases.
 regenerate: all
diff --git a/Instance/Documentation/texi.make b/Instance/Documentation/texi.make
index e2ea9d037..dc52a51ba 100644
--- a/Instance/Documentation/texi.make
+++ b/Instance/Documentation/texi.make
@@ -55,15 +55,15 @@ ifeq ($(GNUSTEP_TEXI2PDF_FLAGS),)
 endif
 
 ifeq ($(GNUSTEP_TEXI2HTML),)
-  GNUSTEP_TEXI2HTML = texi2html
+  GNUSTEP_TEXI2HTML = makeinfo --html
 endif
 ifeq ($(GNUSTEP_TEXI2HTML_FLAGS),)
-  GNUSTEP_TEXI2HTML_FLAGS = -split_chapter -expandinfo
+  GNUSTEP_TEXI2HTML_FLAGS =
 endif
 
 internal-doc-all_:: $(GNUSTEP_INSTANCE).info \
                     $(GNUSTEP_INSTANCE).pdf \
-                    $(GNUSTEP_INSTANCE).html
+                    $(GNUSTEP_INSTANCE)/index.html
 
 internal-textdoc-all_:: $(GNUSTEP_INSTANCE)
 
@@ -91,7 +91,7 @@ $(GNUSTEP_INSTANCE).pdf: $(TEXI_FILES)
 # Some versions of texi2html placed the html files in a subdirectory,
 # so after running it we try to move any from the subdirectory to
 # where they are expected.
-$(GNUSTEP_INSTANCE).html: $(TEXI_FILES)
+$(GNUSTEP_INSTANCE)/index.html: $(TEXI_FILES)
 	-$(GNUSTEP_TEXI2HTML) \
                 $(GNUSTEP_TEXI2HTML_FLAGS) $(ADDITIONAL_TEXI2HTML_FLAGS) \
 		$(GNUSTEP_INSTANCE).texi; \
@@ -145,13 +145,12 @@ internal-doc-install_:: $(GNUSTEP_DOC_INFO)
 	fi
 	if [ -f i$(GNUSTEP_INSTANCE)_toc.html ]; then \
 	  $(INSTALL_DATA) $(GNUSTEP_INSTANCE)_*.html \
-	                  $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR); \
+	                  $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR) || true ; \
 	fi
-	if [ -f $(GNUSTEP_INSTANCE).html ]; then \
-	  $(INSTALL_DATA) $(GNUSTEP_INSTANCE).html \
-	                  $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR); \
-	  $(INSTALL_DATA) $(GNUSTEP_INSTANCE)_*.html \
-	                  $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR); \
+	if [ -f $(GNUSTEP_INSTANCE)/index.html ]; then \
+	  $(MKINSTALLDIRS) $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE); \
+	  $(INSTALL_DATA) $(GNUSTEP_INSTANCE)/*.html \
+	                  $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE); \
 	fi
 
 $(GNUSTEP_DOC_INFO):
@@ -166,6 +165,8 @@ internal-doc-uninstall_::
           $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)_*.html
 	rm -f \
           $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE).html
+	rm -f \
+	  $(GNUSTEP_DOC)/$(DOC_INSTALL_DIR)/$(GNUSTEP_INSTANCE)/*.html
 
 #
 # textdoc targets - these should be merged with the doc targets