summaryrefslogtreecommitdiff
path: root/Build-tools/Do-all-build-steps
diff options
context:
space:
mode:
authortim@work.mysql.com <>2001-03-07 22:47:51 +0100
committertim@work.mysql.com <>2001-03-07 22:47:51 +0100
commit8773431b44c58d7dc49d876ac9085340e47c1f04 (patch)
tree10041d9574351b2fee10d8bf65489f9a0395cc17 /Build-tools/Do-all-build-steps
parentf74ffcca0c642db87fecef404bdbffbd83a38c9a (diff)
parent28433a129efe8a44cd3194f3652faf1e992ae6fb (diff)
downloadmariadb-git-8773431b44c58d7dc49d876ac9085340e47c1f04.tar.gz
Merge
Diffstat (limited to 'Build-tools/Do-all-build-steps')
-rwxr-xr-xBuild-tools/Do-all-build-steps10
1 files changed, 5 insertions, 5 deletions
diff --git a/Build-tools/Do-all-build-steps b/Build-tools/Do-all-build-steps
index d42db28fe2c..7b4fbfc0a24 100755
--- a/Build-tools/Do-all-build-steps
+++ b/Build-tools/Do-all-build-steps
@@ -37,7 +37,7 @@ bk export $BD
cd "$BD"
chmod -R u+rw,g+rw .
-#Make it easy to remove an old build
+# Make it easy to remove an old build
umask 002
CC=$cc CXX=$ccc
@@ -52,12 +52,12 @@ set -e
/bin/rm -f */.deps/*.P
/bin/rm -f config.cache
-aclocal && autoheader && aclocal && automake && autoconf
-(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
+aclocal; autoheader; aclocal; automake; autoconf
(cd bdb/dist && sh s_all)
+(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
-# A normal user starts here. We must use mit-threads. Otherwise it
-# does not end up in the distribution.
+# A normal user starts here. We must use mit-threads, bdb and innobase.
+# Otherwise they do not end up in the distribution.
./configure \
--with-unix-socket-path=/var/tmp/mysql.sock \
--with-low-memory \