Skip to content

Commit 53db576

Browse files
committed
8350137: After JDK-8348975, Linux builds contain man pages for windows only tools
Reviewed-by: erikj
1 parent 10bf48a commit 53db576

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
@@ -673,7 +673,7 @@ ifeq ($(ENABLE_PANDOC), true)
673673

674674
$(foreach m, $(ALL_MODULES), \
675675
$(eval MAN_$m := $(call ApplySpecFilter, $(filter %.md, $(call FindFiles, \
676-
$(call FindModuleManDirs, $m))))) \
676+
$(call FindModuleManDirsForDocs, $m))))) \
677677
$(if $(MAN_$m), \
678678
$(eval $(call SetupProcessMarkdown, MAN_TO_HTML_$m, \
679679
FILES := $(MAN_$m), \

make/common/Modules.gmk

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

8888
SPEC_SUBDIRS += share/specs
8989

90-
MAN_SUBDIRS += share/man windows/man
90+
MAN_SUBDIRS += share/man $(TARGET_OS)/man
91+
92+
# The docs should include the sum of all man pages for all platforms
93+
MAN_DOCS_SUBDIRS += share/man windows/man
9194

9295
# Find all module-info.java files for the current build target platform and
9396
# configuration.
@@ -153,6 +156,10 @@ FindModuleManDirs = \
153156
$(strip $(wildcard \
154157
$(foreach sub, $(MAN_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
155158

159+
FindModuleManDirsForDocs = \
160+
$(strip $(wildcard \
161+
$(foreach sub, $(MAN_DOCS_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS)))))
162+
156163
# Construct the complete module source path
157164
GetModuleSrcPath = \
158165
$(call PathList, \

0 commit comments

Comments
 (0)