summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.bzrignore1
-rw-r--r--BUILD/FINISH.sh7
2 files changed, 4 insertions, 4 deletions
diff --git a/.bzrignore b/.bzrignore
index 2e08fc89aac..9eae1ed2545 100644
--- a/.bzrignore
+++ b/.bzrignore
@@ -196,3 +196,4 @@ bdb/build_vxworks/db.h
bdb/build_win32/db.h
bdb/dist/configure
bdb/dist/tags
+bdb/build_unix/*
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh
index 41eab2442d7..4f13f5f8e4d 100644
--- a/BUILD/FINISH.sh
+++ b/BUILD/FINISH.sh
@@ -12,10 +12,9 @@ commands="\
$make -k clean || true
/bin/rm -f */.deps/*.P config.cache
-aclocal; autoheader; aclocal; automake; autoconf
-cd innobase
-aclocal; autoheader; aclocal; automake; autoconf
-cd ..
+aclocal && autoheader && aclocal && automake && autoconf
+(cd bdb/dist && sh s_all)
+(cd innobase && aclocal && autoheader && aclocal && automake && autoconf)
CFLAGS=\"$cflags\" CXX=gcc CXXFLAGS=\"$cxxflags\" $configure"