Only use one initialization file for LaTeX2HTML; more recent versions only

use the last one specified on the command line instead of all of them.
Smaller changes to reflect updated support.

diff --git a/Doc/tools/mkhowto b/Doc/tools/mkhowto
index e7510b9f1d710da1cab456bb3487b6d3fcabe8d9..3dd744ddea39676c5647ee344253caa36d50503b 100755 (executable)
--- a/Doc/tools/mkhowto
+++ b/Doc/tools/mkhowto
@@ -330,7 +330,6 @@ class Job:
         if not os.path.isdir(builddir):
             os.mkdir(builddir)
         args = [LATEX2HTML_BINARY,
-                "-init_file", L2H_INIT_FILE,
                 "-init_file", self.l2h_aux_init_file,
                 "-dir", builddir,
                 texfile
@@ -362,9 +361,13 @@ class Job:
 
     def write_l2h_aux_init_file(self):
         fp = open(self.l2h_aux_init_file, "w")
-        fp.write("# auxillary init file for latex2html\n"
+        fp.write(open(L2H_INIT_FILE).read())
+        fp.write("\n"
+                 "# auxillary init file for latex2html\n"
                  "# generated by mkhowto\n"
+                 "push (@INC, '%s');\n"
                  "$NO_AUTO_LINK = 1;\n"
+                 % os.path.dirname(L2H_INIT_FILE)
                  )
         options = self.options
         l2hoption(fp, "ABOUT_FILE", options.about_file)
@@ -373,8 +376,6 @@ class Job:
         l2hoption(fp, "ADDRESS", options.address)
         l2hoption(fp, "MAX_LINK_DEPTH", options.max_link_depth)
         l2hoption(fp, "MAX_SPLIT_DEPTH", options.max_split_depth)
-        # this line needed in case $IMAGE_TYPE changed
-        fp.write("adjust_icon_information();\n")
         fp.write("1;\n")
         fp.close()