8224257: fix issues in files generated by pandoc

Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Reviewed-by: tbell, jjg, erikj

make/Docs.gmk

@@ -586,6 +586,7 @@ ifeq ($(ENABLE_PANDOC), true)
             CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
             OPTIONS := -A $($m_$f_BOTTOM_FILE), \
             EXTRA_DEPS := $($m_$f_BOTTOM_FILE), \
+            POST_PROCESS := $(TOOL_FIXUPPANDOC), \
         )) \
         $(eval JDK_SPECS_TARGETS += $($($m_$f_NAME))) \
       ) \
@@ -616,6 +617,7 @@ ifeq ($(ENABLE_PANDOC), true)
             CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
             REPLACEMENTS := @@VERSION_SHORT@@ => $(VERSION_SHORT), \
             OPTIONS := -A $(SPECS_BOTTOM_FILE_1), \
+            POST_PROCESS := $(TOOL_FIXUPPANDOC), \
             EXTRA_DEPS := $(PANDOC_HTML_MANPAGE_FILTER) \
                 $(PANDOC_HTML_MANPAGE_FILTER_JAVASCRIPT) \
                 $(SPECS_BOTTOM_FILE_1), \

make/Main.gmk

@@ -869,7 +869,7 @@ else
   JVM_DOCS_TARGETS ?= hotspot-$(JVM_VARIANT_MAIN)-gensrc
 
   # The gensrc steps for hotspot and jdk.jdi create html spec files.
-  docs-jdk-specs: $(JVM_DOCS_TARGETS) jdk.jdi-gensrc \
+  docs-jdk-specs: buildtools-jdk $(JVM_DOCS_TARGETS) jdk.jdi-gensrc \
       docs-jdk-index
 
   docs-zip: docs-jdk

make/ToolsJdk.gmk

@@ -117,6 +117,9 @@ TOOL_GENCLASSLOADERMAP = $(JAVA_SMALL) $(INTERIM_LANGTOOLS_BOOTCLASSPATH) \
 TOOL_PUBLICSUFFIXLIST = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
     build.tools.publicsuffixlist.GeneratePublicSuffixList
 
+TOOL_FIXUPPANDOC = $(JAVA_SMALL) -cp $(BUILDTOOLS_OUTPUTDIR)/jdk_tools_classes \
+    build.tools.fixuppandoc.Main
+
 ##########################################################################################
 
 # Executable javascript filter for man page generation using pandoc.