summaryrefslogtreecommitdiffstats
path: root/doc/project.am
diff options
context:
space:
mode:
authorJoel Sherrill <joel.sherrill@oarcorp.com>2013-02-21 19:19:48 -0600
committerJoel Sherrill <joel.sherrill@oarcorp.com>2013-02-26 08:03:57 -0600
commit94ca0708a2c3151fe7e92f97bb4ebeb65cb029c9 (patch)
treed72e64da49e642b86c63d0b0bf785843b83c4924 /doc/project.am
parentdoc: Update to build info format with texinfo 4.13 and 5.0 (diff)
downloadrtems-94ca0708a2c3151fe7e92f97bb4ebeb65cb029c9.tar.bz2
doc: Support texi2any and texi2html
This was tested with texi2html-1.82-5.1.el6.noarch and a locally built texinfo 5.0. These are completely different implementations and require different invocations. The Makefile dependencies appear to work but are likely not perfect at this point. The key point is that the autoconf probe detects which to use and responds accordingly with preference given to texi2any.
Diffstat (limited to '')
-rw-r--r--doc/project.am36
1 files changed, 29 insertions, 7 deletions
diff --git a/doc/project.am b/doc/project.am
index fcc96c14b4..6a8778bfc5 100644
--- a/doc/project.am
+++ b/doc/project.am
@@ -1,4 +1,4 @@
-# HACK: makeinfo is locale sensitive
+# HACK: makeinfo is locale sensitive
LANG=C
SUFFIXES = .t
@@ -37,20 +37,42 @@ CLEANFILES += $(PROJECT).pdf
MOSTLYCLEANFILES += $(PDF_IMAGES)
-## HTML
+## HTML
SUFFIXES += .html
-$(PROJECT)*.html: $(PROJECT).texi $($(PROJECT)_TEXINFOS)
+if USE_HTML
+
+<<<<<<< HEAD
+html_project_DATA =
+=======
+html_project_DATA =
+MOSTLYCLEANFILES += $(PROJECT)*.html
+html_project_DATA += *.html
+>>>>>>> bdf959d... doc/project.am: Fix whitespace at EOL
+
+if USE_TEXI2HTML
+index.html $(PROJECT)*.html: $(PROJECT).texi $($(PROJECT)_TEXINFOS)
rm -rf $(PROJECT).html
$(TEXI2HTML) $(TEXI2HTML_ARGS) --menu $< $<
-rm -rf $(PROJECT)
MOSTLYCLEANFILES += $(PROJECT)*.html
-## Common installation points
-if USE_HTML
-html_project_DATA = $(PROJECT)*.html
-endif
+html_project_DATA += index.html $(PROJECT)*.html
+endif # USE_TEXI2HTML
+
+if USE_TEXI2ANY
+index.html *.html: $(PROJECT).texi $($(PROJECT)_TEXINFOS)
+ rm -rf $(PROJECT).html
+ $(TEXI2ANY) $(TEXI2ANY_ARGS) $<
+
+MOSTLYCLEANFILES += $(PROJECT)/*.html
+
+html_project_DATA += *.html
+endif # USE_TEXI2ANY
+
+endif # USE_HTML
+
if USE_DVI
dvi_DATA = $(PROJECT).dvi