diff options
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD/FINISH.sh | 3 | ||||
| -rwxr-xr-x | BUILD/autorun.sh | 4 | ||||
| -rwxr-xr-x | BUILD/compile-alpha-cxx | 2 | ||||
| -rwxr-xr-x | BUILD/compile-alpha-debug | 2 | ||||
| -rwxr-xr-x | BUILD/compile-dist | 4 | ||||
| -rwxr-xr-x | BUILD/compile-ia64-debug-max | 2 | ||||
| -rwxr-xr-x | BUILD/compile-pentium-pgcc | 1 |
7 files changed, 8 insertions, 10 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index 8cd78bf4165..6ee8b27e472 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -5,8 +5,7 @@ configure="./configure $base_configs $extra_configs" commands="\ $make -k distclean || true -/bin/rm -rf */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache bdb/dist/autom4te.cache autom4te.cache innobase/autom4te.cache; - +/bin/rm -rf */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache bdb/dist/autom4te.cache autom4te.cache innobase/autom4te.cache; path=`dirname $0` . \"$path/autorun.sh\"" diff --git a/BUILD/autorun.sh b/BUILD/autorun.sh index 47a80a709a8..82fd1722bd0 100755 --- a/BUILD/autorun.sh +++ b/BUILD/autorun.sh @@ -17,5 +17,5 @@ fi # and --force to overwrite them if they already exist automake --add-missing --force || die "Can't execute automake" autoconf || die "Can't execute autoconf" -(cd bdb/dist && sh s_all) -(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) +(cd storage/bdb/dist && sh s_all) +(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf) diff --git a/BUILD/compile-alpha-cxx b/BUILD/compile-alpha-cxx index c49846fd964..610d358ef82 100755 --- a/BUILD/compile-alpha-cxx +++ b/BUILD/compile-alpha-cxx @@ -1,7 +1,7 @@ /bin/rm -f */.deps/*.P */*.o make -k clean /bin/rm -f */.deps/*.P */*.o -/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache mysql-*.tar.gz +/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache mysql-*.tar.gz path=`dirname $0` . "$path/autorun.sh" diff --git a/BUILD/compile-alpha-debug b/BUILD/compile-alpha-debug index 113c2151461..8beffa65cb5 100755 --- a/BUILD/compile-alpha-debug +++ b/BUILD/compile-alpha-debug @@ -1,7 +1,7 @@ /bin/rm -f */.deps/*.P */*.o make -k clean /bin/rm -f */.deps/*.P */*.o -/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache mysql-*.tar.gz +/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache mysql-*.tar.gz path=`dirname $0` . "$path/autorun.sh" diff --git a/BUILD/compile-dist b/BUILD/compile-dist index 39095f59ffa..a8d180eace1 100755 --- a/BUILD/compile-dist +++ b/BUILD/compile-dist @@ -12,8 +12,8 @@ autoheader libtoolize --automake --force --copy automake --force --add-missing --copy autoconf -(cd bdb/dist && sh s_all) -(cd innobase && aclocal && autoheader && aclocal && automake && autoconf) +(cd storage/bdb/dist && sh s_all) +(cd storage/innobase && aclocal && autoheader && aclocal && automake && autoconf) # Default to gcc for CC and CXX if test -z "$CXX" ; then diff --git a/BUILD/compile-ia64-debug-max b/BUILD/compile-ia64-debug-max index 5082844f088..d5f931c8d51 100755 --- a/BUILD/compile-ia64-debug-max +++ b/BUILD/compile-ia64-debug-max @@ -1,5 +1,5 @@ gmake -k clean || true -/bin/rm -f */.deps/*.P config.cache innobase/config.cache bdb/build_unix/config.cache +/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache storage/bdb/build_unix/config.cache path=`dirname $0` . "$path/autorun.sh" diff --git a/BUILD/compile-pentium-pgcc b/BUILD/compile-pentium-pgcc index 639f108bb2b..411241451cf 100755 --- a/BUILD/compile-pentium-pgcc +++ b/BUILD/compile-pentium-pgcc @@ -2,7 +2,6 @@ AM_MAKEFLAGS="-j 2" gmake -k clean || true /bin/rm -f */.deps/*.P config.cache - path=`dirname $0` . "$path/autorun.sh" |