fix more occurances of cbuild

8 files changed, 29 insertions, 29 deletions

diff --git a/README b/README
index 3be9a50..c070c37 100644
--- a/README
+++ b/README
@@ -30,9 +30,9 @@ following:
 used. It is also possible to change those values at configure
 time. For example:
 
-$CBUILD-PATH/configure
---with-local-snapshots=$CBUILD_PATH/snapshots 
---with-local-builds=$CBUILD-PATH/destdir
+$ABE-PATH/configure
+--with-local-snapshots=$ABE_PATH/snapshots 
+--with-local-builds=$ABE-PATH/destdir
 --with-remote-snapshots=abe@toolchain64.lab:/home/abe/var/snapshots/
 
   This changes the 3 primary paths, including changing the remote host
diff --git a/abe.sh b/abe.sh
index f82e7a4..5e90ff9 100755
--- a/abe.sh
+++ b/abe.sh
@@ -304,7 +304,7 @@ PRECONDITION FILES
 
   host.conf		Generated by configure from host.conf.in.
 
-CBUILD GENERATED FILES AND DIRECTORIES
+ABE GENERATED FILES AND DIRECTORIES
 
   builds/		All builds are stored here.
 
diff --git a/bench/host2sql.sh b/bench/host2sql.sh
index 1aa7b48..d23ecd0 100755
--- a/bench/host2sql.sh
+++ b/bench/host2sql.sh
@@ -27,11 +27,11 @@ fi
 build_machine="`basename ${hostdir}| sed -e 's:^.*-::'`"
 
 # Check the environment for the database access information
-if test x"${CBUILD_DBUSER}" != x; then
-    user="${CBUILD_DBUSER}"
+if test x"${ABE_DBUSER}" != x; then
+    user="${ABE_DBUSER}"
 fi
-if test x"${CBUILD_DBPASSWD}" != x; then
-    passwd="${CBUILD_DBPASSWD}"
+if test x"${ABE_DBPASSWD}" != x; then
+    passwd="${ABE_DBPASSWD}"
 fi
 
 # Get an index number, which is just one more than the total number of testruns
diff --git a/bench/make-benchdata.sh b/bench/make-benchdata.sh
index 23742d0..fc4bca5 100755
--- a/bench/make-benchdata.sh
+++ b/bench/make-benchdata.sh
@@ -11,11 +11,11 @@ passwd="PASSWD"
 tmpdir="/tmp"
 
 # Check the environment for the database access information
-if test x"${CBUILD_DBUSER}" != x; then
-    user="${CBUILD_DBUSER}"
+if test x"${ABE_DBUSER}" != x; then
+    user="${ABE_DBUSER}"
 fi
-if test x"${CBUILD_DBPASSWD}" != x; then
-    passwd="${CBUILD_DBPASSWD}"
+if test x"${ABE_DBPASSWD}" != x; then
+    passwd="${ABE_DBPASSWD}"
 fi
 
 # Create the output file
diff --git a/bench/make-datafiles.sh b/bench/make-datafiles.sh
index 87422e9..efee169 100644
--- a/bench/make-datafiles.sh
+++ b/bench/make-datafiles.sh
@@ -16,11 +16,11 @@ tmpdir="/tmp"
 outfile="benchrun.data"
 
 # Check the environment for the database access information
-if test x"${CBUILD_DBUSER}" != x; then
-    user="${CBUILD_DBUSER}"
+if test x"${ABE_DBUSER}" != x; then
+    user="${ABE_DBUSER}"
 fi
-if test x"${CBUILD_DBPASSWD}" != x; then
-    passwd="${CBUILD_DBPASSWD}"
+if test x"${ABE_DBPASSWD}" != x; then
+    passwd="${ABE_DBPASSWD}"
 fi
 
 # Create the output file
diff --git a/bench/run2sql.sh b/bench/run2sql.sh
index bec4e59..59c9c9a 100755
--- a/bench/run2sql.sh
+++ b/bench/run2sql.sh
@@ -24,11 +24,11 @@ benchrun=0
 tmpdir="/tmp"
 
 # Check the environment for the database access information
-if test x"${CBUILD_DBUSER}" != x; then
-    user="${CBUILD_DBUSER}"
+if test x"${ABE_DBUSER}" != x; then
+    user="${ABE_DBUSER}"
 fi
-if test x"${CBUILD_DBPASSWD}" != x; then
-    passwd="${CBUILD_DBPASSWD}"
+if test x"${ABE_DBPASSWD}" != x; then
+    passwd="${ABE_DBPASSWD}"
 fi
 
 if test x"${benchrun}" = x; then
diff --git a/bench/tab2sql.sh b/bench/tab2sql.sh
index 5c051f3..250c11e 100755
--- a/bench/tab2sql.sh
+++ b/bench/tab2sql.sh
@@ -26,11 +26,11 @@ tmpdir="/tmp"
 outfile="${tmpdir}/bench.tmp"
 
 # Check the environment for the database access information
-if test x"${CBUILD_DBUSER}" != x; then
-    user="${CBUILD_DBUSER}"
+if test x"${ABE_DBUSER}" != x; then
+    user="${ABE_DBUSER}"
 fi
-if test x"${CBUILD_DBPASSWD}" != x; then
-    passwd="${CBUILD_DBPASSWD}"
+if test x"${ABE_DBPASSWD}" != x; then
+    passwd="${ABE_DBPASSWD}"
 fi
 
 # The benchmark.txt files are just test files with fields delimited by a
diff --git a/lib/globals.sh b/lib/globals.sh
index 4b156db..2f64286 100644
--- a/lib/globals.sh
+++ b/lib/globals.sh
@@ -68,14 +68,14 @@ distribution=
 make_flags=
 
 # These can be changed by environment variables
-if test x"${SNAPSHOTS_URL}" != x -o x"${CBUILD_SNAPSHOTS}" != x; then
+if test x"${SNAPSHOTS_URL}" != x -o x"${ABE_SNAPSHOTS}" != x; then
     snapshots="${SNAPSHOTS_URL}"
 fi
-if test x"${CBUILD_DBUSER}" != x; then
-    dbuser="${CBUILD_DBUSER}"
+if test x"${ABE_DBUSER}" != x; then
+    dbuser="${ABE_DBUSER}"
 fi
-if test x"${CBUILD_DBPASSWD}" != x; then
-    dbpasswd="${CBUILD_DBPASSWD}"
+if test x"${ABE_DBPASSWD}" != x; then
+    dbpasswd="${ABE_DBPASSWD}"
 fi
 
 clobber=no