BUILD_DIR -> BUILDDIR, to be consistent with the other *DIR

Change-Id: Ia80a1246a7e3c8862a50a3daf79aba5609b7df3a

8 files changed, 26 insertions, 26 deletions

diff --git a/Makefile.fetch b/Makefile.fetch
index 4b3789763827..c722f68eca66 100644
--- a/Makefile.fetch
+++ b/Makefile.fetch
@@ -70,7 +70,7 @@ endef
 
 download: $(WORKDIR)/download
 
-$(WORKDIR)/download: $(BUILD_DIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)/Makefile.fetch
+$(WORKDIR)/download: $(BUILDDIR)/config_host.mk $(SRCDIR)/download.lst $(SRCDIR)/Makefile.fetch
 	@mkdir -p $(TARFILE_LOCATION)/tmp
 	@date >> $(fetch_LOGFILE)
 	$(foreach item, \
diff --git a/Makefile.in b/Makefile.in
index bd06c200f098..b00164237c40 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -14,24 +14,24 @@ endif
 
 SHELL=/usr/bin/env bash
 export SRCDIR:=@SRC_ROOT@
-export BUILD_DIR:=$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
+export BUILDDIR:=$(patsubst %/,%,$(dir $(realpath $(firstword $(MAKEFILE_LIST)))))
 
-.PHONY : $(filter-out $(BUILD_DIR)/config_host.mk,$(MAKECMDGOALS))
+.PHONY : $(filter-out $(BUILDDIR)/config_host.mk,$(MAKECMDGOALS))
 
 # recursively invoke Makefile.top, which includes config_host.mk
-$(filter-out help,$(firstword $(MAKECMDGOALS))) : $(BUILD_DIR)/config_host.mk
+$(filter-out help,$(firstword $(MAKECMDGOALS))) : $(BUILDDIR)/config_host.mk
 	$(MAKE) -r -f $(SRCDIR)/Makefile.top $(MAKECMDGOALS)
 
 # run configure in an environment not polluted by config_host.mk
-$(BUILD_DIR)/config_host.mk : \
+$(BUILDDIR)/config_host.mk : \
 		$(SRCDIR)/config_host.mk.in \
 		$(SRCDIR)/Makefile.in \
 		$(SRCDIR)/configure.ac \
-		$(BUILD_DIR)/autogen.lastrun
+		$(BUILDDIR)/autogen.lastrun
 	$(SRCDIR)/autogen.sh
 
 # dummy rule in case autogen.lastrun does not exist
-$(BUILD_DIR)/autogen.lastrun:
+$(BUILDDIR)/autogen.lastrun:
 	@true
 
 help:
diff --git a/Makefile.top b/Makefile.top
index 46534e06023e..f37c0e76d59f 100644
--- a/Makefile.top
+++ b/Makefile.top
@@ -14,7 +14,7 @@ ifeq ($(gb_Side),)
 gb_Side:=host
 endif
 
-include $(BUILD_DIR)/config_$(gb_Side).mk
+include $(BUILDDIR)/config_$(gb_Side).mk
 SRCDIR:=$(SRC_ROOT)
 
 ifeq ($(GMAKE_OPTIONS),)
@@ -27,7 +27,7 @@ endif
 
 # This list tells which modules are gbuild ones. It does *not* tell which modules to build. That is directed
 # by the module being mentioned in packimages/prj/build.lst, etc, recursively.
-$(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard */prj/dmake) $(BUILD_DIR)/config_host.mk
+$(WORKDIR)/modules.mk: $(wildcard */Module_*.mk) $(wildcard */prj/dmake) $(BUILDDIR)/config_host.mk
 	mkdir -p $(dir $@)
 	echo -n "gbuild_modules:= tail_build \\" > $@
 	for m in */Module_*.mk; do echo $$m | sed -e 's/\/.*$$/ \\/'; done >> $@
@@ -143,9 +143,9 @@ ifeq ($(BUILD_DMAKE),YES)
 	(if [ -f dmake/Makefile ] ; then $(GNUMAKE) -j $(PARALLELISM) -C dmake distclean; fi) && \
 	rm -f solenv/*/bin/dmake*
 endif
-	rm -fr $(BUILD_DIR)/config_host.mk $(BUILD_DIR)/config_build.mk $(BUILD_DIR)/aclocal.m4 $(BUILD_DIR)/autom4te.cache \
-	$(BUILD_DIR)/config.log $(BUILD_DIR)/config.status $(BUILD_DIR)/configure \
-	$(BUILD_DIR)/config_host.mk.last $(BUILD_DIR)/config_host.mk.stamp $(BUILD_DIR)/warn $(BUILD_DIR)/config/*.h
+	rm -fr $(BUILDDIR)/config_host.mk $(BUILDDIR)/config_build.mk $(BUILDDIR)/aclocal.m4 $(BUILDDIR)/autom4te.cache \
+	$(BUILDDIR)/config.log $(BUILDDIR)/config.status $(BUILDDIR)/configure \
+	$(BUILDDIR)/config_host.mk.last $(BUILDDIR)/config_host.mk.stamp $(BUILDDIR)/warn $(BUILDDIR)/config/*.h
 	find $(SOLARENV)/gdb -name "*.pyc" -exec rm {} \;
 
 #
diff --git a/configure.ac b/configure.ac
index f7b52818f0fe..2b8c4e2a5621 100644
--- a/configure.ac
+++ b/configure.ac
@@ -86,10 +86,10 @@ AC_PROG_EGREP
 # AC_PROG_EGREP doesn't set GREP on all systems as well
 AC_PATH_PROG(GREP, grep)
 
-BUILD_DIR=`pwd`
+BUILDDIR=`pwd`
 cd $srcdir
 SRC_ROOT=`pwd`
-cd $BUILD_DIR
+cd $BUILDDIR
 EXEEXT_FOR_BUILD=
 x_Cygwin=[\#]
 
@@ -97,8 +97,8 @@ if test "$build_os" = "cygwin"; then
     EXEEXT_FOR_BUILD=.exe
     PathFormat "$SRC_ROOT"
     SRC_ROOT="$formatted_path"
-    PathFormat "$BUILD_DIR"
-    BUILD_DIR="$formatted_path"
+    PathFormat "$BUILDDIR"
+    BUILDDIR="$formatted_path"
     x_Cygwin=
 fi
 
@@ -2409,7 +2409,7 @@ if test -n "${with_solver_and_workdir_root}"; then
         SOLARVER=${formatted_path}/solver
     fi
 else
-    SOLARVER=${BUILD_DIR}/solver
+    SOLARVER=${BUILDDIR}/solver
 fi
 
 dnl ===================================================================
@@ -4034,7 +4034,7 @@ if test -n "${with_solver_and_workdir_root}"; then
         WORKDIR=${formatted_path}/workdir/${INPATH}
     fi
 else
-    WORKDIR=${BUILD_DIR}/workdir/${INPATH}
+    WORKDIR=${BUILDDIR}/workdir/${INPATH}
 fi
 OUTDIR="${SOLARVER}/${INPATH}"
 SOLARINC="-I. -I${SOLARVER}/$INPATH/inc/external -I${SOLARVER}/$INPATH/inc -I$SRC_ROOT/solenv/inc $SOLARINC"
diff --git a/g b/g
index 711318b11913..e28509d9d9c1 100755
--- a/g
+++ b/g
@@ -11,8 +11,8 @@ SUBMODULES_ALL="dictionaries helpcontent2 translations"
 
 pushd $(dirname $0) > /dev/null
 if [ -f config_host.mk ] ; then
-    # we are in the BUILD_DIR
-    SRC_ROOT=$(cat ${BUILD_DIR}/config_host.mk | grep SRC_ROOT | sed -e "s/.*=//")
+    # we are in the BUILDDIR
+    SRC_ROOT=$(cat ${BUILDDIR}/config_host.mk | grep SRC_ROOT | sed -e "s/.*=//")
 else
     SRC_ROOT=$(pwd)
 fi
@@ -121,8 +121,8 @@ local repo
 get_configured_submodules()
 {
     SUBMODULES_CONFIGURED=""
-    if [ -f "${BUILD_DIR}/config_host.mk" ] ; then
-	SUBMODULES_CONFIGURED=$(cat ${BUILD_DIR}/config_host.mk | grep GIT_NEEDED_SUBMODULES | sed -e "s/.*=//")
+    if [ -f "${BUILDDIR}/config_host.mk" ] ; then
+	SUBMODULES_CONFIGURED=$(cat ${BUILDDIR}/config_host.mk | grep GIT_NEEDED_SUBMODULES | sed -e "s/.*=//")
     else
 	# if we need the configured submoduel before the configuration is done. we assumed you want them all
 	SUBMODULES_CONFIGURED=${SUBMODULES_ALL?}
diff --git a/scp2/CustomTarget_langmacros.mk b/scp2/CustomTarget_langmacros.mk
index 1d3509cf92c1..cedd61343c48 100644
--- a/scp2/CustomTarget_langmacros.mk
+++ b/scp2/CustomTarget_langmacros.mk
@@ -31,10 +31,10 @@ $(call gb_CustomTarget_get_target,scp2/macros) : $(call gb_CustomTarget_get_work
 
 $(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc :| $(call gb_CustomTarget_get_workdir,scp2/macros)/.dir
 
-$(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc : $(SRCDIR)/scp2/macros/macro.pl $(BUILD_DIR)/config_host.mk.stamp
+$(call gb_CustomTarget_get_workdir,scp2/macros)/langmacros.inc : $(SRCDIR)/scp2/macros/macro.pl $(BUILDDIR)/config_host.mk.stamp
 	$(call gb_Helper_abbreviate_dirs,\
 		export COMPLETELANGISO_VAR='$(gb_ScpTemplateTarget_LANGS)' && \
-		$(PERL) $< -verbose -o $@ -c $(BUILD_DIR)/config_host.mk.stamp \
+		$(PERL) $< -verbose -o $@ -c $(BUILDDIR)/config_host.mk.stamp \
 	)
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:
diff --git a/solenv/gbuild/platform/com_GCC_defs.mk b/solenv/gbuild/platform/com_GCC_defs.mk
index f6a6f8f6ca76..cc2a606ea85b 100644
--- a/solenv/gbuild/platform/com_GCC_defs.mk
+++ b/solenv/gbuild/platform/com_GCC_defs.mk
@@ -157,7 +157,7 @@ gb_DEBUG_CXXFLAGS := $(FNO_DEFAULT_INLINE)
 
 gb_LinkTarget_INCLUDE :=\
     $(subst -I. , ,$(SOLARINC)) \
-    -I$(BUILD_DIR)/config \
+    -I$(BUILDDIR)/config \
 
 ifeq ($(COM_GCC_IS_CLANG),TRUE)
 ifeq ($(COMPILER_PLUGIN_TOOL),)
diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk
index da85a31df211..fcdea68fdaff 100644
--- a/solenv/gbuild/platform/com_MSC_class.mk
+++ b/solenv/gbuild/platform/com_MSC_class.mk
@@ -162,7 +162,7 @@ gb_LinkTarget_CXXFLAGS := $(gb_CXXFLAGS)
 gb_LinkTarget_INCLUDE :=\
 	$(subst -I. , ,$(SOLARINC)) \
 	$(foreach inc,$(subst ;, ,$(JDKINC)),-I$(inc)) \
-	-I$(BUILD_DIR)/config \
+	-I$(BUILDDIR)/config \
 
 gb_LinkTarget_get_pdbfile = $(call gb_LinkTarget_get_target,)pdb/$(1).pdb