openjdk/jdk9u
1
0
Fork 0
mirror of https://github.com/openjdk/jdk9u.git synced 2025-12-11 11:04:20 -06:00
Code Issues Packages Projects Releases Wiki Activity

8190725: Freetype license file provided with configure not included in images

Browse Source 
Reviewed-by: ihse, tbell
This commit is contained in:
Erik Joelsson 2017-12-01 09:37:24 -08:00
parent 3e3d6a162a
commit 52fda63f16
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
make/CreateJmods.gmk
View File

@ -80,8 +80,8 @@ ifneq ($(MAN_DIR), )
endif endif
LEGAL_NOTICES := \ LEGAL_NOTICES := \
$(SUPPORT_OUTPUTDIR)/modules_legal/java.base \ $(call uniq, $(SUPPORT_OUTPUTDIR)/modules_legal/java.base \
$(call FindModuleLegalDirs, $(MODULE)) \ $(call FindModuleLegalDirs, $(MODULE))) \
# #
LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES)) LEGAL_NOTICES_PATH := $(call PathList, $(LEGAL_NOTICES))

6
make/common/Modules.gmk
View File

@ -397,8 +397,10 @@ LEGAL_SUBDIRS += share/legal
# $1 - Module to find legal dirs for # $1 - Module to find legal dirs for
FindModuleLegalDirs = \ FindModuleLegalDirs = \
$(strip $(wildcard \ $(strip $(wildcard \
$(addsuffix /$(strip $1), $(IMPORT_MODULES_LEGAL)) \ $(addsuffix /$(strip $1), $(SUPPORT_OUTPUTDIR)/modules_legal \
$(foreach sub, $(LEGAL_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))))) $(IMPORT_MODULES_LEGAL)) \
$(foreach sub, $(LEGAL_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))) \
))
################################################################################ ################################################################################