changeset 50691:f348e5d4769b

8202914: Let custom makefile override jmod intput dir locations Reviewed-by: tbell
author erikj
date Fri, 11 May 2018 08:39:21 -0700
parents 8a7d677ad039
children 8afb040fd242
files make/CreateJmods.gmk
diffstat 1 files changed, 6 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/make/CreateJmods.gmk	Fri May 11 15:07:43 2018 +0100
+++ b/make/CreateJmods.gmk	Fri May 11 08:39:21 2018 -0700
@@ -39,16 +39,16 @@
 JMODS_DIR := $(IMAGES_OUTPUTDIR)/jmods
 JMODS_TEMPDIR := $(SUPPORT_OUTPUTDIR)/jmods
 
-LIBS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \
+LIBS_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \
     $(SUPPORT_OUTPUTDIR)/modules_libs $(IMPORT_MODULES_LIBS))))
-CMDS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \
+CMDS_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \
     $(SUPPORT_OUTPUTDIR)/modules_cmds $(IMPORT_MODULES_CMDS))))
-CONF_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \
+CONF_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \
     $(SUPPORT_OUTPUTDIR)/modules_conf $(IMPORT_MODULES_CONF))))
-CLASSES_DIR := $(wildcard $(JDK_OUTPUTDIR)/modules/$(MODULE))
-INCLUDE_HEADERS_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \
+CLASSES_DIR ?= $(wildcard $(JDK_OUTPUTDIR)/modules/$(MODULE))
+INCLUDE_HEADERS_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \
     $(SUPPORT_OUTPUTDIR)/modules_include $(IMPORT_MODULES_INCLUDE_HEADERS))))
-MAN_DIR := $(firstword $(wildcard $(addsuffix /$(MODULE), \
+MAN_DIR ?= $(firstword $(wildcard $(addsuffix /$(MODULE), \
     $(SUPPORT_OUTPUTDIR)/modules_man $(IMPORT_MODULES_MAN))))
 
 $(eval $(call FillCacheFind, \