make/copy/CopyCommon.gmk

@@ -26,15 +26,15 @@
 default: all
 
 include $(SPEC)
 include MakeBase.gmk
 
-INCLUDEDIR = $(JDK_OUTPUTDIR)/include
-LIBDIR := $(JDK_OUTPUTDIR)/lib
+INCLUDE_DST_DIR := $(JDK_OUTPUTDIR)/include
+LIB_DST_DIR := $(JDK_OUTPUTDIR)/lib
 
-OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/$(OPENJDK_TARGET_OS)
+INCLUDE_DST_OS_DIR := $(INCLUDE_DST_DIR)/$(OPENJDK_TARGET_OS)
 
 ifeq ($(OPENJDK_TARGET_OS), windows)
-  OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/win32
+  INCLUDE_DST_OS_DIR := $(INCLUDE_DST_DIR)/win32
 else ifeq ($(OPENJDK_TARGET_OS), macosx)
-  OPENJDK_TARGET_OS_INCLUDE = $(INCLUDEDIR)/darwin
+  INCLUDE_DST_OS_DIR := $(INCLUDE_DST_DIR)/darwin
 endif