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

*** 97,113 ****
  ################################################################################
  #
  # Copy cursor.properties and cursors gif files to LIB_DST_DIR
  #
  ifneq ($(OPENJDK_TARGET_OS), macosx)
!   OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/conf
  else
    OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/conf
  endif
  
  CURSORS_DEST_DIR := $(LIB_DST_DIR)/images/cursors
! CURSORS_OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_API_DIR)/conf/images/cursors
  
  $(CURSORS_DEST_DIR)/cursors.properties: $(CURSORS_OPENJDK_TARGET_OS_LIB_SRC)/cursors.properties
          $(call install-file)
  
  DESKTOP_CONF_FILES += $(CURSORS_DEST_DIR)/cursors.properties
--- 97,113 ----
  ################################################################################
  #
  # Copy cursor.properties and cursors gif files to LIB_DST_DIR
  #
  ifneq ($(OPENJDK_TARGET_OS), macosx)
!   OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/conf
  else
    OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/macosx/conf
  endif
  
  CURSORS_DEST_DIR := $(LIB_DST_DIR)/images/cursors
! CURSORS_OPENJDK_TARGET_OS_LIB_SRC := $(JDK_TOPDIR)/src/java.desktop/$(OPENJDK_TARGET_OS_TYPE)/conf/images/cursors
  
  $(CURSORS_DEST_DIR)/cursors.properties: $(CURSORS_OPENJDK_TARGET_OS_LIB_SRC)/cursors.properties
          $(call install-file)
  
  DESKTOP_CONF_FILES += $(CURSORS_DEST_DIR)/cursors.properties