From 9782b12250acd9ecacf831649d5d4f8fdaca91d8 Mon Sep 17 00:00:00 2001
From: Waldemar Brodkorb <wbx@openadk.org>
Date: Sat, 4 Apr 2015 07:57:06 -0500
Subject: fix the leading underscore in firmware dir

---
 mk/vars.mk | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/mk/vars.mk b/mk/vars.mk
index c7fb59233..4ecd87972 100644
--- a/mk/vars.mk
+++ b/mk/vars.mk
@@ -9,7 +9,7 @@ INSTALL_SCRIPT=		install -m0755
 MAKEFLAGS=		$(EXTRA_MAKEFLAGS)
 BUILD_USER=		$(shell id -un)
 BUILD_GROUP=		$(shell id -gn)
-ADK_SUFFIX:=		_${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}_${ADK_TARGET_CPU_ARCH}
+ADK_SUFFIX:=		${ADK_TARGET_SYSTEM}_${ADK_TARGET_LIBC}_${ADK_TARGET_CPU_ARCH}
 ifneq ($(ADK_TARGET_FLOAT),)
 ADK_SUFFIX:=		$(ADK_SUFFIX)_$(ADK_TARGET_FLOAT)
 endif
@@ -30,7 +30,7 @@ endif
 SCRIPT_DIR:=		$(BASE_DIR)/scripts
 STAGING_HOST_DIR:=	${BASE_DIR}/host_${GNU_HOST_NAME}
 HOST_BUILD_DIR:=	${BASE_DIR}/host_build_${GNU_HOST_NAME}
-TOOLCHAIN_DIR:=		${BASE_DIR}/toolchain${ADK_SUFFIX}
+TOOLCHAIN_DIR:=		${BASE_DIR}/toolchain_${ADK_SUFFIX}
 
 # dirs for cleandir
 FW_DIR_PFX:=		$(BASE_DIR)/firmware
@@ -41,13 +41,13 @@ TOOLCHAIN_DIR_PFX=	$(BASE_DIR)/toolchain_*
 STAGING_HOST_DIR_PFX:=	${BASE_DIR}/host_*
 TARGET_DIR_PFX:=	$(BASE_DIR)/root_*
 
-TARGET_DIR:=		$(BASE_DIR)/root${ADK_SUFFIX}
+TARGET_DIR:=		$(BASE_DIR)/root_${ADK_SUFFIX}
 FW_DIR:=		$(BASE_DIR)/firmware/${ADK_SUFFIX}
-BUILD_DIR:=		${BASE_DIR}/build${ADK_SUFFIX}
-STAGING_TARGET_DIR:=	${BASE_DIR}/target${ADK_SUFFIX}
-STAGING_PKG_DIR:=	${BASE_DIR}/pkg${ADK_SUFFIX}
-STAGING_HOST2TARGET:=	../../target${ADK_SUFFIX}
-TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build${ADK_SUFFIX}
+BUILD_DIR:=		${BASE_DIR}/build_${ADK_SUFFIX}
+STAGING_TARGET_DIR:=	${BASE_DIR}/target_${ADK_SUFFIX}
+STAGING_PKG_DIR:=	${BASE_DIR}/pkg_${ADK_SUFFIX}
+STAGING_HOST2TARGET:=	../../target_${ADK_SUFFIX}
+TOOLCHAIN_BUILD_DIR=	$(BASE_DIR)/toolchain_build_${ADK_SUFFIX}
 PACKAGE_DIR:=		$(FW_DIR)/packages
 SCRIPT_TARGET_DIR:=	${STAGING_TARGET_DIR}/scripts
 
-- 
cgit v1.2.3