[project @ 2000-11-27 12:04:00 by rrt]

Changed LATEX2HTML to HEVEA, and added HACHA support.

diff --git a/mk/config.mk.in b/mk/config.mk.in
index f6a798a..8ee3b5b 100644 (file)
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -599,7 +599,8 @@ INSTALL                     = @INSTALL@
 # 
 INSTALL                        := $(subst .././install-sh,$(FPTOOLS_TOP_ABS)/install-sh,$(INSTALL))
 LATEX                  = latex
-LATEX2HTML             = hevea
+HEVEA                  = hevea
+HACHA                  = hacha
 LN_S                   = @LN_S@
 MANMACROS              = -man
 MSMACROS               = -ms

diff --git a/mk/opts.mk b/mk/opts.mk
index 915b4b8..5214983 100644 (file)
--- a/mk/opts.mk
+++ b/mk/opts.mk
@@ -5,7 +5,7 @@
 #      This file defines Make variables for the
 #      option flags for each utility program
 #
-#      $Id: opts.mk,v 1.16 2000/11/21 12:32:55 rrt Exp $
+#      $Id: opts.mk,v 1.17 2000/11/27 12:04:00 rrt Exp $
 #
 #################################################################################
 
@@ -94,6 +94,8 @@ INSTALL_OPTS       = $(SRC_INSTALL_OPTS) $(WAY$(_way)_INSTALL_OPTS) $(EXTRA_INST
 INSTALL_BIN_OPTS   = $(INSTALL_OPTS) $(SRC_INSTALL_BIN_OPTS)
 LD_OPTS            = $(SRC_LD_OPTS) $(WAY$(_way)_LD_OPTS) $(EXTRA_LD_OPTS)
 LINT_OPTS          = $(SRC_LINT_OPTS) $(WAY$(_way)_LINT_OPTS) $(EXTRA_LINT_OPTS)
+HEVEA_OPTS         = $(SRC_HEVEA_OPTS) $(WAY$(_way)_HEVEA_OPTS) $(EXTRA_HEVEA_OPTS)
+HACHA_OPTS         = $(SRC_HACHA_OPTS) $(WAY$(_way)_HACHA_OPTS) $(EXTRA_HACHA_OPTS)
 LIT2CHANGELOG_OPTS = $(SRC_LIT2CHANGELOG_OPTS) $(WAY$(_way)_LIT2CHANGELOG_OPTS) \
                      $(EXTRA_LIT2CHANGELOG_OPTS)
 LIT2HTML_OPTS      = $(SRC_LIT2HTML_OPTS) $(WAY$(_way)_LIT2HTML_OPTS) $(EXTRA_LIT2HTML_OPTS)

diff --git a/mk/suffix.mk b/mk/suffix.mk
index 51b8fff..9c427d1 100644 (file)
--- a/mk/suffix.mk
+++ b/mk/suffix.mk
@@ -209,9 +209,10 @@ endif
 
 %.html : %.tex
        @$(RM) $@
-       $(LATEX2HTML) $(LATEX2HTML_OPTS) $(patsubst %.tex,%.hva,$<) $<
-       $(LATEX2HTML) $(LATEX2HTML_OPTS) $(patsubst %.tex,%.hva,$<) $<
-# Make twice to resolve xrefs
+       $(HEVEA) $(HEVEA_OPTS) $(patsubst %.tex,%.hva,$<) $<
+       $(HEVEA) $(HEVEA_OPTS) $(patsubst %.tex,%.hva,$<) $<
+       $(HACHA) $(HACHA_OPTS) $(patsubst %.tex,%.html,$<)
+# Run HeVeA twice to resolve labels
 
 %.rtf : %.sgml
        @$(RM) $@