diff options
| author | pekka@orca.ndb.mysql.com <> | 2006-08-22 10:24:58 +0200 |
|---|---|---|
| committer | pekka@orca.ndb.mysql.com <> | 2006-08-22 10:24:58 +0200 |
| commit | b97a4b7f444dba3aef42e822002a250ee3296993 (patch) | |
| tree | c71789bf4d137efec4098d271c97f68470d462de /BUILD | |
| parent | a1ea21bf26dfaaa4777c0425935f7c0a5a8bee17 (diff) | |
| parent | d170f1b12495c3d5fcd606efaf608cbc1b7c317a (diff) | |
| download | mariadb-git-b97a4b7f444dba3aef42e822002a250ee3296993.tar.gz | |
Merge pnousiainen@bk-internal.mysql.com:/home/bk/mysql-5.1
into orca.ndb.mysql.com:/export/home/space/pekka/ndb/version/my51-ndb
Diffstat (limited to 'BUILD')
| -rw-r--r-- | BUILD/FINISH.sh | 2 | ||||
| -rwxr-xr-x | BUILD/compile-alpha-cxx | 2 | ||||
| -rwxr-xr-x | BUILD/compile-alpha-debug | 2 | ||||
| -rwxr-xr-x | BUILD/compile-dist | 1 | ||||
| -rwxr-xr-x | BUILD/compile-ia64-debug-max | 2 |
5 files changed, 4 insertions, 5 deletions
diff --git a/BUILD/FINISH.sh b/BUILD/FINISH.sh index a0e702515e6..51f6e909172 100644 --- a/BUILD/FINISH.sh +++ b/BUILD/FINISH.sh @@ -5,7 +5,7 @@ configure="./configure $base_configs $extra_configs" commands="\ $make -k distclean || true -/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; +/bin/rm -rf */.deps/*.P config.cache storage/innobase/config.cache autom4te.cache innobase/autom4te.cache; path=`dirname $0` . \"$path/autorun.sh\"" diff --git a/BUILD/compile-alpha-cxx b/BUILD/compile-alpha-cxx index 610d358ef82..1624f4ed622 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 storage/innobase/config.cache storage/bdb/build_unix/config.cache mysql-*.tar.gz +/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache mysql-*.tar.gz path=`dirname $0` . "$path/autorun.sh" diff --git a/BUILD/compile-alpha-debug b/BUILD/compile-alpha-debug index 8beffa65cb5..b565a18272f 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 storage/innobase/config.cache storage/bdb/build_unix/config.cache mysql-*.tar.gz +/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache mysql-*.tar.gz path=`dirname $0` . "$path/autorun.sh" diff --git a/BUILD/compile-dist b/BUILD/compile-dist index 874500977b7..0504b308ceb 100755 --- a/BUILD/compile-dist +++ b/BUILD/compile-dist @@ -7,7 +7,6 @@ # package" that is used as the basis for all other binary builds. # test -f Makefile && make distclean -(cd storage/bdb/dist && sh s_all) (cd storage/innobase && aclocal && autoheader && \ libtoolize --automake --force --copy && \ automake --force --add-missing --copy && autoconf) diff --git a/BUILD/compile-ia64-debug-max b/BUILD/compile-ia64-debug-max index d5f931c8d51..d1017ad506b 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 storage/innobase/config.cache storage/bdb/build_unix/config.cache +/bin/rm -f */.deps/*.P config.cache storage/innobase/config.cache path=`dirname $0` . "$path/autorun.sh" |