OpenJDK / jdk / hs
changeset 47811:45af799ceb6a
8190725: Freetype license file provided with configure not included in images
Reviewed-by: ihse, tbell
| author | erikj |
|---|---|
| date | Mon, 13 Nov 2017 16:32:30 +0100 |
| parents | d0c784151182 |
| children | 9f913dffab13 |
| files | make/CreateJmods.gmk make/common/Modules.gmk |
| diffstat | 2 files changed, 6 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/make/CreateJmods.gmk Mon Nov 13 15:54:20 2017 +0100 +++ b/make/CreateJmods.gmk Mon Nov 13 16:32:30 2017 +0100 @@ -80,8 +80,8 @@ endif LEGAL_NOTICES := \ - $(SUPPORT_OUTPUTDIR)/modules_legal/java.base \ - $(call FindModuleLegalDirs, $(MODULE)) \ + $(call uniq, $(SUPPORT_OUTPUTDIR)/modules_legal/java.base \ + $(call FindModuleLegalDirs, $(MODULE))) \ # LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES))
--- a/make/common/Modules.gmk Mon Nov 13 15:54:20 2017 +0100 +++ b/make/common/Modules.gmk Mon Nov 13 16:32:30 2017 +0100 @@ -409,8 +409,10 @@ # $1 - Module to find legal dirs for FindModuleLegalDirs = \ $(strip $(wildcard \ - $(addsuffix /$(strip $1), $(IMPORT_MODULES_LEGAL)) \ - $(foreach sub, $(LEGAL_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))))) + $(addsuffix /$(strip $1), $(SUPPORT_OUTPUTDIR)/modules_legal \ + $(IMPORT_MODULES_LEGAL)) \ + $(foreach sub, $(LEGAL_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))) \ + )) ################################################################################