diff options
author | unknown <tim@threads.polyesthetic.msg> | 2001-03-04 20:59:13 -0500 |
---|---|---|
committer | unknown <tim@threads.polyesthetic.msg> | 2001-03-04 20:59:13 -0500 |
commit | ea7f14cf360196ec06d1de8b696cac9317c7dc12 (patch) | |
tree | d6af5e6205f6428836bde04b6f8090e10d302bbe | |
parent | 520e3600c186551cd98a11ec1ffb6e62263cc4c5 (diff) | |
download | mariadb-git-ea7f14cf360196ec06d1de8b696cac9317c7dc12.tar.gz |
Small changes to make life with BDB in the tree easier.
BitKeeper/etc/ignore:
added bdb/build_unix/*
BUILD/FINISH.sh:
Run the s_all script in bdb/dist before running configure
-rw-r--r-- | .bzrignore | 1 | ||||
-rw-r--r-- | BUILD/FINISH.sh | 7 |
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" |