comparison make/copy/CopyCommon.gmk @ 16338:81508186e5bc

8066474: Remove the lib/ directory from Linux and Solaris images Reviewed-by: tbell, ihse
author erikj
date Mon, 05 Dec 2016 17:56:20 +0100
parents b8f27b54cc51
children c6b2de8d1f29
comparison
equal deleted inserted replaced
1:4882b666d628 2:02feea993585
21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA 21 # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
22 # or visit www.oracle.com if you need additional information or have any 22 # or visit www.oracle.com if you need additional information or have any
23 # questions. 23 # questions.
24 # 24 #
25 25
26 default: all 26 INCLUDE_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_include/$(MODULE)
27 27 LIB_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)
28 include $(SPEC) 28 CONF_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_conf/$(MODULE)
29 include MakeBase.gmk
30
31 INCLUDE_DST_DIR := $(JDK_OUTPUTDIR)/include
32 LIB_DST_DIR := $(JDK_OUTPUTDIR)/lib
33 29
34 INCLUDE_DST_OS_DIR := $(INCLUDE_DST_DIR)/$(OPENJDK_TARGET_OS) 30 INCLUDE_DST_OS_DIR := $(INCLUDE_DST_DIR)/$(OPENJDK_TARGET_OS)
35 31
36 ifeq ($(OPENJDK_TARGET_OS), windows) 32 ifeq ($(OPENJDK_TARGET_OS), windows)
37 INCLUDE_DST_OS_DIR := $(INCLUDE_DST_DIR)/win32 33 INCLUDE_DST_OS_DIR := $(INCLUDE_DST_DIR)/win32