make/Docs.gmk

*** 540,560 ****
  
    $(foreach m, $(ALL_MODULES), \
      $(eval SPECS_$m := $(call FindModuleSpecsDirs, $m)) \
      $(foreach d, $(SPECS_$m), \
        $(if $(filter %.md, $(call CacheFind, $d)), \
!         $(eval $m_$d_NAME := CONVERT_MARKDOWN_$m_$(strip $(call RelativePath, $d, $(TOPDIR)))) \
          $(eval $(call SetupProcessMarkdown, $($m_$d_NAME), \
              SRC := $d, \
              FILES := $(filter %.md, $(call CacheFind, $d)), \
              DEST := $(DOCS_OUTPUTDIR)/specs/, \
              CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
          )) \
          $(eval JDK_SPECS_TARGETS += $($($m_$d_NAME))) \
        ) \
      ) \
    )
  endif
  
  # Special treatment for generated documentation
  
  JDWP_PROTOCOL := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/jdwp-protocol.html
--- 540,582 ----
  
    $(foreach m, $(ALL_MODULES), \
      $(eval SPECS_$m := $(call FindModuleSpecsDirs, $m)) \
      $(foreach d, $(SPECS_$m), \
        $(if $(filter %.md, $(call CacheFind, $d)), \
!         $(eval $m_$d_NAME := SPECS_TO_HTML_$m_$(strip $(call RelativePath, $d, $(TOPDIR)))) \
          $(eval $(call SetupProcessMarkdown, $($m_$d_NAME), \
              SRC := $d, \
              FILES := $(filter %.md, $(call CacheFind, $d)), \
              DEST := $(DOCS_OUTPUTDIR)/specs/, \
              CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
          )) \
          $(eval JDK_SPECS_TARGETS += $($($m_$d_NAME))) \
        ) \
      ) \
    )
+ 
+   # For all markdown files in $module/share/man directories, convert them to
+   # html.
+   $(foreach m, $(ALL_MODULES), \
+     $(eval MAN_$m := $(call FindModuleManDirs, $m)) \
+     $(foreach d, $(MAN_$m), \
+       $(if $(filter %.md, $(call CacheFind, $d)), \
+         $(eval $m_$d_NAME := MAN_TO_HTML_$m_$(strip $(call RelativePath, $d, $(TOPDIR)))) \
+         $(eval $(call SetupProcessMarkdown, $($m_$d_NAME), \
+             SRC := $d, \
+             FILES := $(filter %.md, $(call CacheFind, $d)), \
+             DEST := $(DOCS_OUTPUTDIR)/specs/man, \
+             CSS := $(GLOBAL_SPECS_DEFAULT_CSS_FILE), \
+             REPLACEMENTS := @@VERSION_SHORT@@ => $(VERSION_SHORT), \
+         )) \
+         $(eval JDK_SPECS_TARGETS += $($($m_$d_NAME))) \
+       ) \
+     ) \
+   )
+ 
+   # The html generated from markdown also needs the css file
+   JDK_SPECS_TARGETS += $(COPY_GLOBAL_RESOURCES)
  endif
  
  # Special treatment for generated documentation
  
  JDWP_PROTOCOL := $(SUPPORT_OUTPUTDIR)/gensrc/jdk.jdi/jdwp-protocol.html