make/common/Modules.gmk

*** 392,407 ****
  ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE))
    LEGAL_SUBDIRS += $(OPENJDK_TARGET_OS_TYPE)/legal
  endif
  LEGAL_SUBDIRS += share/legal
  
! # Find all legal dirs for a particular module
  # $1 - Module to find legal dirs for
! FindModuleLegalDirs = \
      $(strip $(wildcard \
!         $(addsuffix /$(strip $1), $(SUPPORT_OUTPUTDIR)/modules_legal \
!             $(IMPORT_MODULES_LEGAL)) \
          $(foreach sub, $(LEGAL_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))) \
      ))
  
  ################################################################################
  
--- 392,406 ----
  ifneq ($(OPENJDK_TARGET_OS), $(OPENJDK_TARGET_OS_TYPE))
    LEGAL_SUBDIRS += $(OPENJDK_TARGET_OS_TYPE)/legal
  endif
  LEGAL_SUBDIRS += share/legal
  
! # Find all legal src dirs for a particular module
  # $1 - Module to find legal dirs for
! FindModuleLegalSrcDirs = \
      $(strip $(wildcard \
!         $(addsuffix /$(strip $1), $(IMPORT_MODULES_LEGAL)) \
          $(foreach sub, $(LEGAL_SUBDIRS), $(addsuffix /$(strip $1)/$(sub), $(TOP_SRC_DIRS))) \
      ))
  
  ################################################################################