jdk/make/copy/Copy-java.base.gmk

*** 97,107 ****
  endif
  
  ifeq ($(OPENJDK_TARGET_OS), macosx)
    JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/macosx/conf/$(JVMCFG_ARCH)/jvm.cfg
  else
!   JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_API_DIR)/conf/$(JVMCFG_ARCH)/jvm.cfg
  endif
  JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
  JVMCFG := $(JVMCFG_DIR)/jvm.cfg
  
  # To do: should this also support -zeroshark?
--- 97,107 ----
  endif
  
  ifeq ($(OPENJDK_TARGET_OS), macosx)
    JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/macosx/conf/$(JVMCFG_ARCH)/jvm.cfg
  else
!   JVMCFG_SRC := $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/$(JVMCFG_ARCH)/jvm.cfg
  endif
  JVMCFG_DIR := $(JDK_OUTPUTDIR)/lib$(OPENJDK_TARGET_CPU_LIBDIR)
  JVMCFG := $(JVMCFG_DIR)/jvm.cfg
  
  # To do: should this also support -zeroshark?
*** 213,223 ****
          $(call install-file)
  
  NET_CONF_FILES += $(JDK_OUTPUTDIR)/lib/net.properties
  
  ifeq ($(OPENJDK_TARGET_OS), solaris)
!   $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template: $(JDK_TOPDIR)/src/java.base/${OPENJDK_TARGET_OS_API_DIR}/conf/sdp/sdp.conf.template
          $(ECHO) $(LOG_INFO) Copying $(@F)
          $(call install-file)
  
    NET_CONF_FILES += $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template
  endif
--- 213,223 ----
          $(call install-file)
  
  NET_CONF_FILES += $(JDK_OUTPUTDIR)/lib/net.properties
  
  ifeq ($(OPENJDK_TARGET_OS), solaris)
!   $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template: $(JDK_TOPDIR)/src/java.base/$(OPENJDK_TARGET_OS_TYPE)/conf/sdp/sdp.conf.template
          $(ECHO) $(LOG_INFO) Copying $(@F)
          $(call install-file)
  
    NET_CONF_FILES += $(JDK_OUTPUTDIR)/lib/sdp/sdp.conf.template
  endif