From ea26e9cdbe0dbbfd6a8a609d6c94e958b17ea3fa Mon Sep 17 00:00:00 2001
From: Antti Kantee <pooka@iki.fi>
Date: Mon, 29 Jun 2015 20:38:27 +0000
Subject: [PATCH] Apptools variable consistency naming.

Make everything that is a directory pathname contain "DIR"
---
 app-tools/Makefile.app-tools          | 4 ++--
 app-tools/cc.in                       | 8 ++++----
 app-tools/configure.in                | 4 ++--
 app-tools/gmake.in                    | 4 ++--
 app-tools/make.in                     | 4 ++--
 app-tools/specs-compile_or_ferment.in | 2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/app-tools/Makefile.app-tools b/app-tools/Makefile.app-tools
index 7ceaaf2bd..c6672abdc 100644
--- a/app-tools/Makefile.app-tools
+++ b/app-tools/Makefile.app-tools
@@ -39,8 +39,8 @@ $(APP_TOOLS_DIR)/rumprun-$(APP_TOOLS_PLATFORM)-${1}:			\
 		-e 's#!CXX!#$(CXX)#g;'					\
 		-e 's#!GNUPLATFORM!#$(subst				\
 		    --,-rumprun-,${APP_TOOLS_GNUPLATFORM})#g;'		\
-		-e 's#!BASE!#$(abspath ../..)#g;'			\
-		-e 's#!APPTOOLS!#$(APP_TOOLS_DIR)#g;'			\
+		-e 's#!BASE_DIR!#$(abspath ../..)#g;'			\
+		-e 's#!APPTOOLS_DIR!#$(APP_TOOLS_DIR)#g;'		\
 		-e 's#!APPTOOLS_PLATFORM!#$(APP_TOOLS_PLATFORM)#g;'	\
 		-e 's#!CPPFLAGS!#$(BUILDRUMP_TOOL_CPPFLAGS)#g;'		\
 		-e 's#!CFLAGS!#$(BUILDRUMP_TOOL_CFLAGS)#g;'		\
diff --git a/app-tools/cc.in b/app-tools/cc.in
index 07544429f..a879cb57b 100755
--- a/app-tools/cc.in
+++ b/app-tools/cc.in
@@ -75,12 +75,12 @@ done
 case ${MODE} in
 compile)
 	exec ${CC} ${CFLAGS} -no-integrated-cpp \
-	    -specs=!APPTOOLS!/rumprun-!APPTOOLS_PLATFORM!-specs-compile_or_ferment \
+	    -specs=!APPTOOLS_DIR!/rumprun-!APPTOOLS_PLATFORM!-specs-compile_or_ferment \
 	    "$@" ${EXTRALIBS}
 	;;
 bake)
 	exec ${CC} ${CFLAGS} -no-integrated-cpp \
-	    -specs=!APPTOOLS!/rumprun-!APPTOOLS_PLATFORM!-specs-bake \
+	    -specs=!APPTOOLS_DIR!/rumprun-!APPTOOLS_PLATFORM!-specs-bake \
 	    -Wl,--defsym=__RuMpRuN_baked__=0 \
 	    "$@" ${EXTRALIBS}
 	;;
@@ -89,14 +89,14 @@ ferment)
 	# with no rump components. '-u main' is necessary to pull in main if the
 	# user is linking it in from a library.
 	${CC} ${CFLAGS} -no-integrated-cpp \
-	    -specs=!APPTOOLS!/rumprun-!APPTOOLS_PLATFORM!-specs-compile_or_ferment \
+	    -specs=!APPTOOLS_DIR!/rumprun-!APPTOOLS_PLATFORM!-specs-compile_or_ferment \
 	    -Wl,-r -Wl,-u,main \
 	    -Wl,--defsym=__RuMpRuN_fermented__=0 \
 	    "$@" ${EXTRALIBS} || die
 
 	# Try a stub link with minimal rump components. If that fails then stop.
 	${CC} ${CFLAGS} -no-integrated-cpp \
-	    -specs=!APPTOOLS!/rumprun-!APPTOOLS_PLATFORM!-specs-stub \
+	    -specs=!APPTOOLS_DIR!/rumprun-!APPTOOLS_PLATFORM!-specs-stub \
 	    ${OUTFILE} -o /dev/null
 	if [ $? -ne 0 ]; then
 		[ -f "${OUTFILE}" ] && rm -f ${OUTFILE}
diff --git a/app-tools/configure.in b/app-tools/configure.in
index 906fa9d57..a1a1ba5b3 100755
--- a/app-tools/configure.in
+++ b/app-tools/configure.in
@@ -3,7 +3,7 @@
 set -e
 prog=$1; shift
 
-export CC=!APPTOOLS!/rumprun-!APPTOOLS_PLATFORM!-cc
-export CXX=!APPTOOLS!/rumprun-!APPTOOLS_PLATFORM!-c++
+export CC=!APPTOOLS_DIR!/rumprun-!APPTOOLS_PLATFORM!-cc
+export CXX=!APPTOOLS_DIR!/rumprun-!APPTOOLS_PLATFORM!-c++
 
 exec "$prog" --host=!GNUPLATFORM! "$@"
diff --git a/app-tools/gmake.in b/app-tools/gmake.in
index c32c9a85f..ab1bb3891 100755
--- a/app-tools/gmake.in
+++ b/app-tools/gmake.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export CC=!APPTOOLS!/rumprun-!APPTOOLS_PLATFORM!-cc
-export CXX=!APPTOOLS!/rumprun-!APPTOOLS_PLATFORM!-c++
+export CC=!APPTOOLS_DIR!/rumprun-!APPTOOLS_PLATFORM!-cc
+export CXX=!APPTOOLS_DIR!/rumprun-!APPTOOLS_PLATFORM!-c++
 
 exec gmake "$@"
diff --git a/app-tools/make.in b/app-tools/make.in
index 049f8d382..ea86c2310 100755
--- a/app-tools/make.in
+++ b/app-tools/make.in
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export CC=!APPTOOLS!/rumprun-!APPTOOLS_PLATFORM!-cc
-export CXX=!APPTOOLS!/rumprun-!APPTOOLS_PLATFORM!-c++
+export CC=!APPTOOLS_DIR!/rumprun-!APPTOOLS_PLATFORM!-cc
+export CXX=!APPTOOLS_DIR!/rumprun-!APPTOOLS_PLATFORM!-c++
 
 exec make "$@"
diff --git a/app-tools/specs-compile_or_ferment.in b/app-tools/specs-compile_or_ferment.in
index 15c80bf86..f91ba0e56 100644
--- a/app-tools/specs-compile_or_ferment.in
+++ b/app-tools/specs-compile_or_ferment.in
@@ -1,7 +1,7 @@
 %rename cpp_options old_cpp_options
  
 *cpp_options:
--nostdinc -isystem !BASE!/rumprun/include -isystem !BASE!/rumprun/include/c++ %(old_cpp_options) !CPPFLAGS! -D__RUMPRUN__
+-nostdinc -isystem !BASE_DIR!/rumprun/include -isystem !BASE_DIR!/rumprun/include/c++ %(old_cpp_options) !CPPFLAGS! -D__RUMPRUN__
 
 %rename cc1_options old_cc1_options