- move some variables

make/environment-build.mk

@@ -172,10 +172,6 @@ CCACHE        = /usr/bin/ccache
 CCACHE_DIR    = $(HOME)/.ccache-ni-buildsystem-$(BOXARCH)-$(BOXSERIES)
 export CCACHE_DIR
 
-STATIC_LIB_DIR = $(STATIC_DIR)/lib
-TARGET_LIB_DIR = $(TARGET_DIR)/lib
-TARGET_INCLUDE_DIR = $(TARGET_DIR)/include
-
 # create debug image
 DEBUG ?= no
 
@@ -240,6 +236,11 @@ else ifeq ($(BOXSERIES), hd51)
   CXX11_ABI              =
 endif
 
+STATIC_LIB_DIR = $(STATIC_DIR)/lib
+TARGET_LIB_DIR = $(TARGET_DIR)/lib
+TARGET_MODULES_DIR = $(TARGET_LIB_DIR)/modules/$(KERNEL_VERSION_FULL)
+TARGET_INCLUDE_DIR = $(TARGET_DIR)/include
+
 TARGET_CFLAGS   = -pipe $(TARGET_O_CFLAGS) $(TARGET_MARCH_CFLAGS) $(TARGET_EXTRA_CFLAGS) $(CXX11_ABI) -g -I$(TARGET_INCLUDE_DIR)
 TARGET_CPPFLAGS = $(TARGET_CFLAGS)
 TARGET_CXXFLAGS = $(TARGET_CFLAGS)

make/kernel-coolstream.mk

@@ -8,8 +8,6 @@ IMAGE		= $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/$(BOXARCH)/boot/Image
 ZIMAGE		= $(BUILD_TMP)/linux-$(KERNEL_VERSION)/arch/$(BOXARCH)/boot/zImage
 MODULES_DIR	= $(BUILD_TMP)/linux-$(KERNEL_VERSION)-modules/lib/modules/$(KERNEL_VERSION_FULL)
 
-TARGET_MODULES_DIR = $(TARGET_LIB_DIR)/modules/$(KERNEL_VERSION_FULL)
-
 ifneq ($(wildcard $(SKEL_ROOT)-$(BOXFAMILY)),)
   KERNEL_DESTDIR = $(SKEL_ROOT)-$(BOXFAMILY)/var/update
 else