equal
deleted
inserted
replaced
78 ifneq ($(MAN_DIR), ) |
78 ifneq ($(MAN_DIR), ) |
79 JMOD_FLAGS += --man-pages $(MAN_DIR) |
79 JMOD_FLAGS += --man-pages $(MAN_DIR) |
80 DEPS += $(call CacheFind, $(MAN_DIR)) |
80 DEPS += $(call CacheFind, $(MAN_DIR)) |
81 endif |
81 endif |
82 |
82 |
|
83 # If a specific modules_legal dir exists for this module, only pick up files |
|
84 # from there. These files were explicitly filtered or modified in <module>-copy |
|
85 # targets. For the rest, just pick up everything from the source legal dirs. |
83 LEGAL_NOTICES := \ |
86 LEGAL_NOTICES := \ |
84 $(call uniq, $(SUPPORT_OUTPUTDIR)/modules_legal/java.base \ |
87 $(SUPPORT_OUTPUTDIR)/modules_legal/common \ |
85 $(call FindModuleLegalDirs, $(MODULE))) \ |
88 $(if $(wildcard $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE)), \ |
86 # |
89 $(wildcard $(SUPPORT_OUTPUTDIR)/modules_legal/$(MODULE)), \ |
|
90 $(call FindModuleLegalSrcDirs, $(MODULE)) \ |
|
91 ) |
87 |
92 |
88 LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES)) |
93 LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES)) |
89 DEPS += $(call CacheFind, $(LEGAL_NOTICES)) |
94 DEPS += $(call CacheFind, $(LEGAL_NOTICES)) |
90 |
95 |
91 JMOD_FLAGS += --legal-notices $(LEGAL_NOTICES_PATH) |
96 JMOD_FLAGS += --legal-notices $(LEGAL_NOTICES_PATH) |