comparison make/copy/Copy-java.base.gmk @ 10990:97d8785e9ee5

8058631: Rename posix to unix in build system to match file name changes Reviewed-by: simonis, erikj, tbell
author ihse
date Fri, 21 Nov 2014 16:05:11 +0100
parents 529f33e7f04d
children 4316e603ae2a
comparison
equal deleted inserted replaced
5:2806ceb0a5c0 7:c39057fae395
81 endif 81 endif
82 82
83 ifeq ($(OPENJDK_TARGET_OS), macosx) 83 ifeq ($(OPENJDK_TARGET_OS), macosx)
84 JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/macosx/conf/$(JVMCFG_ARCH)/jvm.cfg 84 JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/macosx/conf/$(JVMCFG_ARCH)/jvm.cfg
85 else 85 else
86 JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/conf/$(JVMCFG_ARCH)/jvm.cfg 86 JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/$(JVMCFG_ARCH)/jvm.cfg
87 endif 87 endif
88 JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR) 88 JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
89 JVMCFG := $(JVMCFG_DIR)/jvm.cfg 89 JVMCFG := $(JVMCFG_DIR)/jvm.cfg
90 90
91 # To do: should this also support -zeroshark? 91 # To do: should this also support -zeroshark?
188 $(call install-file) 188 $(call install-file)
189 189
190 NET_CONF_FILES += $(JDK_OUTPUTDIR)/lib/net.properties 190 NET_CONF_FILES += $(JDK_OUTPUTDIR)/lib/net.properties
191 191
192 ifeq ($(OPENJDK_TARGET_OS), solaris) 192 ifeq ($(OPENJDK_TARGET_OS), solaris)
193 $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template: $(JDK_TOPDIR)/src/java.base/${OPENJDK_TARGET_OS_API_DIR}/conf/sdp/sdp.conf.template 193 $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template: $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/sdp/sdp.conf.template
194 $(ECHO) $(LOG_INFO) Copying $(@F) 194 $(ECHO) $(LOG_INFO) Copying $(@F)
195 $(call install-file) 195 $(call install-file)
196 196
197 NET_CONF_FILES += $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template 197 NET_CONF_FILES += $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template
198 endif 198 endif