diff options
| author | unknown <serg@serg.mysql.com> | 2003-02-13 17:12:52 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2003-02-13 17:12:52 +0100 |
| commit | b80049a55e00b2256186855fd05f0936c23b77a7 (patch) | |
| tree | ce1c4f6527ad29136f5441ae3bd54cd84c4397f2 /BUILD | |
| parent | efcf8b57c735faa7f05567400a8f1b480d49acf3 (diff) | |
| parent | 944df6e9ec0d19bb4fb4eaf485a57fb7ba0cfd5d (diff) | |
| download | mariadb-git-b80049a55e00b2256186855fd05f0936c23b77a7.tar.gz | |
Merge serg.mysql.com:/usr/home/serg/Abk/mysql-4.0
into serg.mysql.com:/usr/home/serg/Abk/mysql-4.1
BUILD/FINISH.sh:
Auto merged
client/mysqldump.c:
Auto merged
scripts/mysqld_safe.sh:
Auto merged
sql/opt_sum.cc:
Auto merged
sql/sql_class.cc:
Auto merged
BitKeeper/deleted/.del-world.sql~6603b5c62c5bac53:
Auto merged
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD/FINISH.sh | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 5358667b881..2c2b4925c3d 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -13,11 +13,11 @@ commands="\ $make -k clean || true /bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache -if [ ! aclocal ] ; then echo \"Can't execute aclocal\" ; exit 1; fi -if [ ! autoheader ] ; then echo \"Can't execute autoheader\" ; exit 1; fi -if [ ! aclocal ] ; then echo \"Can't execute aclocal\" ; exit 1; fi -if [ ! automake ] ; then echo \"Can't execute automake\" ; exit 1; fi -if [ ! autoconf ] ; then echo \"Can't execute autoconf\" ; exit 1; fi +aclocal || (echo \"Can't execute aclocal\" && exit 1) +autoheader || (echo \"Can't execute autoheader\" && exit 1) +aclocal || (echo \"Can't execute aclocal\" && exit 1) +automake || (echo \"Can't execute automake\" && exit 1) +autoconf || (echo \"Can't execute autoconf\" && exit 1) (cd bdb/dist && sh s_all) (cd innobase && aclocal && autoheader && aclocal && automake && autoconf) if [ -d gemini ] |