Author: rfm
Date: Fri May 13 21:15:52 2016
New Revision: 39758
URL: http://svn.gna.org/viewcvs/gnustep?rev=39758&view=rev
Log:
Another missed patch
Modified:
tools/make/trunk/ChangeLog
tools/make/trunk/Documentation/GNUmakefile
tools/make/trunk/Instance/Documentation/texi.make
Modified: tools/make/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/ChangeLog?rev=39758&r1=39757&r2=39758&view=diff
==============================================================================
--- tools/make/trunk/ChangeLog (original)
+++ tools/make/trunk/ChangeLog Fri May 13 21:15:52 2016
@@ -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 <[email protected]>
Modified: tools/make/trunk/Documentation/GNUmakefile
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/Documentation/GNUmakefile?rev=39758&r1=39757&r2=39758&view=diff
==============================================================================
--- tools/make/trunk/Documentation/GNUmakefile (original)
+++ tools/make/trunk/Documentation/GNUmakefile Fri May 13 21:15:52 2016
@@ -167,8 +167,6 @@
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
Modified: tools/make/trunk/Instance/Documentation/texi.make
URL:
http://svn.gna.org/viewcvs/gnustep/tools/make/trunk/Instance/Documentation/texi.make?rev=39758&r1=39757&r2=39758&view=diff
==============================================================================
--- tools/make/trunk/Instance/Documentation/texi.make (original)
+++ tools/make/trunk/Instance/Documentation/texi.make Fri May 13 21:15:52 2016
@@ -55,15 +55,15 @@
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 @@
# 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 @@
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 @@
$(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
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
