make/copy/CopyCommon.gmk

*** 21,37 ****
  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  # or visit www.oracle.com if you need additional information or have any
  # questions.
  #
  
! default: all
! 
! include $(SPEC)
! include MakeBase.gmk
! 
! INCLUDE_DST_DIR := $(JDK_OUTPUTDIR)/include
! LIB_DST_DIR := $(JDK_OUTPUTDIR)/lib
  
  INCLUDE_DST_OS_DIR := $(INCLUDE_DST_DIR)/$(OPENJDK_TARGET_OS)
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
    INCLUDE_DST_OS_DIR := $(INCLUDE_DST_DIR)/win32
--- 21,33 ----
  # Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
  # or visit www.oracle.com if you need additional information or have any
  # questions.
  #
  
! INCLUDE_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_include/$(MODULE)
! LIB_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_libs/$(MODULE)
! CONF_DST_DIR := $(SUPPORT_OUTPUTDIR)/modules_conf/$(MODULE)
  
  INCLUDE_DST_OS_DIR := $(INCLUDE_DST_DIR)/$(OPENJDK_TARGET_OS)
  
  ifeq ($(OPENJDK_TARGET_OS), windows)
    INCLUDE_DST_OS_DIR := $(INCLUDE_DST_DIR)/win32