# HG changeset patch
# User jwe
# Date 1122577123 0
# Node ID a8f40275b7de843f71e201c0446d924fd578ba3c
# Parent  0f6947621602cc9c06efe175d03f1c845865ceea
[project @ 2005-07-28 18:58:42 by jwe]

diff --git a/doc/ChangeLog b/doc/ChangeLog
--- a/doc/ChangeLog
+++ b/doc/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-28  John W. Eaton  <jwe@octave.org>
+
+	* faq/Makefile.in, interpreter/Makefile.in, liboctave/Makefile.in:
+	Use makeinfo instead of texi2html to generate HTML.
+
 2005-05-02  John W. Eaton  <jwe@octave.org>
 
 	* interpreter/munge-texi.cc (skip_comments): New function.
diff --git a/doc/faq/Makefile.in b/doc/faq/Makefile.in
--- a/doc/faq/Makefile.in
+++ b/doc/faq/Makefile.in
@@ -34,29 +34,23 @@
 	$(SED) -e 's/@@/ at /g' -e 's/@[a-zA-Z]*//g' $< | spell > $@.tmp
 	mv $@.tmp $@
 
-all: Octave-FAQ.info Octave-FAQ.dvi Octave-FAQ.ps Octave-FAQ.pdf Octave-FAQ_toc.html
+all: Octave-FAQ.info Octave-FAQ.dvi Octave-FAQ.ps Octave-FAQ.pdf HTML/index.html
 .PHONY: all
 
-Octave-FAQ.info: Octave-FAQ.texi
-	-$(MAKEINFO) -I$(srcdir) $(srcdir)/Octave-FAQ.texi
+Octave-FAQ.info: $(TEXINFO)
+	-$(MAKEINFO) -I$(srcdir) $<
 
-Octave-FAQ.dvi: Octave-FAQ.texi
-	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):"; \
-	  export TEXINPUTS; \
-	  $(TEXI2DVI) $(srcdir)/Octave-FAQ.texi
+Octave-FAQ.dvi: $(TEXINFO)
+	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2DVI) $<
 
-Octave-FAQ.ps: Octave-FAQ.dvi
-	-dvips -o Octave-FAQ.ps Octave-FAQ.dvi
+Octave-FAQ.ps: $(TEXINFO)
+	-dvips -o $@ $<
 
-Octave-FAQ.pdf: Octave-FAQ.texi
-	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):"; \
-	  export TEXINPUTS; \
-	  $(TEXI2PDF) $(srcdir)/Octave-FAQ.texi
+Octave-FAQ.pdf: $(TEXINFO)
+	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2PDF) $<
 
-# These option forms are supported by texi2html 1.65 and probably also
-# more recent versions.
-Octave-FAQ_toc.html:
-	-texi2html -expandinfo -split_chapter $(srcdir)/Octave-FAQ.texi
+HTML/index.html: $(TEXINFO)
+	-$(MAKEINFO) --html --output=HTML $<
 
 check install install-strip uninstall:
 .PHONY: check install install-strip uninstall
@@ -84,7 +78,7 @@
 maintainer-clean: distclean
 	rm -f tags TAGS Octave-FAQ.info Octave-FAQ.info-*
 	rm -f Octave-FAQ.dvi Octave-FAQ.ps
-	rm -f Octave-FAQ*.html
+	rm -rf HTML
 .PHONY: maintainer-clean
 
 dist: all
diff --git a/doc/interpreter/Makefile.in b/doc/interpreter/Makefile.in
--- a/doc/interpreter/Makefile.in
+++ b/doc/interpreter/Makefile.in
@@ -35,7 +35,7 @@
 
 SUB_TEXINFO := $(SUB_SOURCE:.txi=.texi)
 
-TEXINFO := $(MAIN_TEXINFO) $(SUB_TEXINFO)
+TEXINFO := $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi
 
 FORMATTED = octave.dvi octave.ps octave.pdf \
 	octave.info octave.info-[0-9]* \
@@ -59,7 +59,7 @@
 	$(SED) -e 's/@@/ at /g' -e 's/@[a-zA-Z]*//g' $< | spell > $@.tmp
 	mv $@.tmp $@
 
-all: octave.info octave.dvi octave.ps octave.pdf octave_toc.html
+all: octave.info octave.dvi octave.ps octave.pdf HTML/index.html
 .PHONY: all
 
 $(TEXINFO): src-DOCSTRINGS scripts-DOCSTRINGS munge-texi$(BUILD_EXEEXT)
@@ -82,21 +82,17 @@
 	  -d $(TOPDIR)/scripts/DOCSTRINGS < $< > $@.t
 	@$(top_srcdir)/move-if-change $@.t $@
 
-octave.info: $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi
+octave.info: $(TEXINFO)
 	-$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $<
 
-octave.dvi: $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi
-	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):"; \
-	  export TEXINPUTS; \
-	  $(TEXI2DVI) $<
+octave.dvi: $(TEXINFO)
+	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2DVI) $<
 
 octave.ps: octave.dvi
-	-dvips -o octave.ps octave.dvi
+	-dvips -o $@ $<
 
-octave.pdf: $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi
-	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):"; \
-	  export TEXINPUTS; \
-	  $(TEXI2PDF) $<
+octave.pdf: $(TEXINFO)
+	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2PDF) $<
 
 ../../INSTALL.OCTAVE: install.texi
 	rm -f INSTALL
@@ -112,10 +108,8 @@
 	  -I$(srcdir) -I$(srcdir)/.. $<
 	mv BUGS ../../BUGS
 
-# These option forms are supported by texi2html 1.65 and probably also
-# more recent versions.
-octave_toc.html: $(MAIN_TEXINFO) $(SUB_TEXINFO)
-	-texi2html -expandinfo -split_chapter -I . -I $(srcdir)/.. $<
+HTML/index.html: $(TEXINFO)
+	-$(MAKEINFO) --html --output=HTML -I . -I $(srcdir)/.. $<
 
 check: all
 .PHONY: check
@@ -190,6 +184,7 @@
 
 maintainer-clean: distclean clean-texi
 	rm -f tags TAGS $(FORMATTED)
+	rm -rf HTML
 .PHONY: maintainer-clean
 
 clean-texi:
diff --git a/doc/liboctave/Makefile.in b/doc/liboctave/Makefile.in
--- a/doc/liboctave/Makefile.in
+++ b/doc/liboctave/Makefile.in
@@ -20,11 +20,16 @@
 
 SOURCES =
 
-TEXINFO = array.texi bugs.texi cp-idx.texi dae.texi diffeq.texi \
+MAIN_TEXINFO = liboctave.texi
+
+SUB_TEXINFO = \
+	array.texi bugs.texi cp-idx.texi dae.texi diffeq.texi \
 	error.texi factor.texi fn-idx.texi install.texi intro.texi \
-	liboctave.texi matvec.texi nleqn.texi nlfunc.texi ode.texi \
+	matvec.texi nleqn.texi nlfunc.texi ode.texi \
 	optim.texi preface.texi quad.texi range.texi
 
+TEXINFO = $(MAIN_TEXINFO) $(SUB_TEXINFO) ../conf.texi
+
 FORMATTED = liboctave.dvi liboctave.ps liboctave.pdf \
 	liboctave.info liboctave*.html
 
@@ -37,30 +42,23 @@
 	$(SED) -e 's/@@/ at /g' -e 's/@[a-zA-Z]*//g' $< | spell > $@.tmp
 	mv $@.tmp $@
 
-all: liboctave.info liboctave.dvi liboctave.ps liboctave.pdf liboctave_toc.html
+all: liboctave.info liboctave.dvi liboctave.ps liboctave.pdf HTML/index.html
 .PHONY: all
 
-liboctave.info: $(TEXINFO) ../conf.texi
-	-$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $(srcdir)/liboctave.texi
+liboctave.info: $(TEXINFO)
+	-$(MAKEINFO) -I$(srcdir) -I$(srcdir)/.. $<
 
-liboctave.dvi: $(TEXINFO) ../conf.texi
-	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):"; \
-	  export TEXINPUTS; \
-	  $(TEXI2DVI) $(srcdir)/liboctave.texi
+liboctave.dvi: $(TEXINFO)
+	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2DVI) $<
 
 liboctave.ps: liboctave.dvi
-	-dvips -o liboctave.ps liboctave.dvi
+	-dvips -o $@ $<
 
-liboctave.pdf: $(TEXINFO) ../conf.texi
-	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):"; \
-	  export TEXINPUTS; \
-	  $(TEXI2PDF) $(srcdir)/liboctave.texi
+liboctave.pdf: $(TEXINFO)
+	-TEXINPUTS="$(srcdir):$(srcdir)/..:$(TEXINPUTS):" $(TEXI2PDF) $<
 
-# These option forms are supported by texi2html 1.65 and probably also
-# more recent versions.
-liboctave_toc.html:
-	-texi2html -expandinfo -split_chapter -I $(srcdir)/.. \
-	  $(srcdir)/liboctave.texi
+HTML/index.html: $(TEXINFO)
+	-$(MAKEINFO) --html --output=HTML -I $(srcdir)/.. $<
 
 check:
 .PHONY: check
@@ -96,7 +94,7 @@
 maintainer-clean: distclean
 	rm -f tags TAGS liboctave.info liboctave.info-*
 	rm -f liboctave.dvi liboctave.ps
-	rm -f liboctave*.html
+	rm -rf HTML
 .PHONY: maintainer-clean
 
 dist: all
diff --git a/doc/refcard/Makefile.in b/doc/refcard/Makefile.in
--- a/doc/refcard/Makefile.in
+++ b/doc/refcard/Makefile.in
@@ -29,37 +29,31 @@
 all: $(FORMATTED)
 
 refcard-a4.dvi: refcard-a4.tex refcard.tex
-	-TEXINPUTS="$(srcdir):$(TEXINPUTS):"; export TEXINPUTS; \
-	  tex $(srcdir)/refcard-a4.tex
+	-TEXINPUTS="$(srcdir):$(TEXINPUTS):" tex $<
 
 refcard-a4.ps: refcard-a4.dvi
-	-dvips -T 297mm,210mm -o refcard-a4.ps refcard-a4.dvi
+	-dvips -T 297mm,210mm -o $@ $<
 
 refcard-a4.pdf: refcard-a4.tex refcard.tex
-	-TEXINPUTS="$(srcdir):$(TEXINPUTS):"; export TEXINPUTS; \
-	  pdftex $(srcdir)/refcard-a4.tex
+	-TEXINPUTS="$(srcdir):$(TEXINPUTS):" pdftex $<
 
 refcard-legal.dvi: refcard-legal.tex refcard.tex
-	-TEXINPUTS="$(srcdir):$(TEXINPUTS):"; export TEXINPUTS; \
-	  tex $(srcdir)/refcard-legal.tex
+	-TEXINPUTS="$(srcdir):$(TEXINPUTS):" tex $<
 
 refcard-legal.ps: refcard-legal.dvi
-	-dvips -T 14in,8.5in -o refcard-legal.ps refcard-legal.dvi
+	-dvips -T 14in,8.5in -o $@ $<
 
 refcard-legal.pdf: refcard-legal.tex refcard.tex
-	-TEXINPUTS="$(srcdir):$(TEXINPUTS):"; export TEXINPUTS; \
-	  pdftex $(srcdir)/refcard-legal.tex
+	-TEXINPUTS="$(srcdir):$(TEXINPUTS):" pdftex $<
 
 refcard-letter.dvi: refcard-letter.tex refcard.tex
-	-TEXINPUTS="$(srcdir):$(TEXINPUTS):"; export TEXINPUTS; \
-	  tex $(srcdir)/refcard-letter.tex
+	-TEXINPUTS="$(srcdir):$(TEXINPUTS):" tex $<
 
 refcard-letter.ps: refcard-letter.dvi
-	-dvips -T 11in,8.5in -o refcard-letter.ps refcard-letter.dvi
+	-dvips -T 11in,8.5in -o $@ $<
 
 refcard-letter.pdf: refcard-letter.tex refcard.tex
-	-TEXINPUTS="$(srcdir):$(TEXINPUTS):"; export TEXINPUTS; \
-	  pdftex $(srcdir)/refcard-letter.tex
+	-TEXINPUTS="$(srcdir):$(TEXINPUTS):" pdftex $<
 
 check install install-strip uninstall:
 .PHONY: check install install-strip uninstall