From 52fda63f165e7aa1fed4fb3ef280b3cf4e47c021 Mon Sep 17 00:00:00 2001
From: Erik Joelsson <erikj@openjdk.org>
Date: Fri, 1 Dec 2017 09:37:24 -0800
Subject: [PATCH] 8190725: Freetype license file provided with configure not
 included in images

Reviewed-by: ihse, tbell
---
 make/CreateJmods.gmk    | 4 ++--
 make/common/Modules.gmk | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/make/CreateJmods.gmk b/make/CreateJmods.gmk
index 299198b900..c073631714 100644
--- a/make/CreateJmods.gmk
+++ b/make/CreateJmods.gmk
@@ -80,8 +80,8 @@ ifneq ($(MAN_DIR), )
 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))
diff --git a/make/common/Modules.gmk b/make/common/Modules.gmk
index 9bbcf6c8f5..a50528d1e0 100644
--- a/make/common/Modules.gmk
+++ b/make/common/Modules.gmk
@@ -397,8 +397,10 @@ LEGAL_SUBDIRS += share/legal
 # $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))) \
+    ))
 
 ################################################################################