Skip to content

Commit ef35e66

Browse files
nizarbenallaPaul Hohensee
authored and
Paul Hohensee
committed
8350137: After JDK-8348975, Linux builds contain man pages for windows only tools
Backport-of: 53db57648a09c4c380064eea11fcdb680011d741
1 parent 114f2e3 commit ef35e66

File tree

2 files changed

+9
-2
lines changed

2 files changed

+9
-2
lines changed

make/Docs.gmk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -680,7 +680,7 @@ ifeq ($(ENABLE_PANDOC), true)
680680

681681
$(foreach m, $(ALL_MODULES), \
682682
$(eval MAN_$m := $(call ApplySpecFilter, $(filter %.md, $(call FindFiles, \
683-
$(call FindModuleManDirs, $m))))) \
683+
$(call FindModuleManDirsForDocs, $m))))) \
684684
$(if $(MAN_$m), \
685685
$(eval $(call SetupProcessMarkdown, MAN_TO_HTML_$m, \
686686
FILES := $(MAN_$m), \

make/common/Modules.gmk

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,10 @@ SRC_SUBDIRS += share/classes
9292

9393
SPEC_SUBDIRS += share/specs
9494

95-
MAN_SUBDIRS += share/man windows/man
95+
MAN_SUBDIRS += share/man $(TARGET_OS)/man
96+
97+
# The docs should include the sum of all man pages for all platforms
98+
MAN_DOCS_SUBDIRS += share/man windows/man
9699

97100
# Find all module-info.java files for the current build target platform and
98101
# configuration.
@@ -158,6 +161,10 @@ FindModuleManDirs = \
158161
$(strip $(wildcard \
159162
$(foreach sub, $(MAN_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
160163

164+
FindModuleManDirsForDocs = \
165+
$(strip $(wildcard \
166+
$(foreach sub, $(MAN_DOCS_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
167+
161168
# Construct the complete module source path
162169
GetModuleSrcPath = \
163170
$(call PathList, \

0 commit comments

Comments
 (0)