diff options
| -rwxr-xr-x | Build-tools/Do-all-build-steps | 13 | ||||
| -rw-r--r-- | libmysql/Makefile.am | 2 | ||||
| -rw-r--r-- | libmysql/Makefile.shared | 2 | ||||
| -rw-r--r-- | libmysql_r/Makefile.am | 5 |
4 files changed, 16 insertions, 6 deletions
diff --git a/Build-tools/Do-all-build-steps b/Build-tools/Do-all-build-steps index 78644e03982..682113f4f72 100755 --- a/Build-tools/Do-all-build-steps +++ b/Build-tools/Do-all-build-steps @@ -1,6 +1,7 @@ #!/bin/bash WD=`pwd` +# Don't write a wrong path for BD !!!!! BD=/my/tmp/BUILD TMP_SCRIPT=$WD/Logs/00-temp-for-do-all-build-steps.$$ @@ -12,6 +13,7 @@ EXTRA_CONFIG="--without-perl" echo "Building on $to_host" +rm -rf $BD/* mkdir -p $WD/Logs mkdir -p $BD/Logs @@ -22,9 +24,12 @@ set -x cd "$WD" # Create a build directory tree bk export -w $BD -chmod a+x $BD/mit-pthreads/config/configure +chmod a+x $BD/mit-pthreads/config/configure $BD/Build-tools/* $BD/tests/*.pl cd "$BD" +#Make it easy to remove an old build +umask 002 + CC=$cc CXX=$ccc export CC CXX @@ -51,7 +56,8 @@ aclocal; autoheader; aclocal; automake; autoconf ./configure \ --with-unix-socket-path=/var/tmp/mysql.sock \ --with-low-memory \ - --with-mit-threads=yes $EXTRA_CONFIG + --with-mit-threads=yes $EXTRA_CONFIG \ + --enable-thread-safe-client gmake # --jobs=4 does not work. @@ -77,5 +83,6 @@ fi # Create a commercial MySQL distribution (mysqlcom-VER.tar.gz) from # the newly made source distribution +cd "$BD" DIST=`ls -t mysql-*.tar.gz | head -1` -sh $BD/Build-tools/mysql-copyright --target=. $DIST +$BD/Build-tools/mysql-copyright --target=. $DIST diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am index c67aebc10c9..758af52fe5a 100644 --- a/libmysql/Makefile.am +++ b/libmysql/Makefile.am @@ -20,6 +20,8 @@ target = libmysqlclient.la target_defs = -DUNDEF_THREADS_HACK LIBS = @CLIENT_LIBS@ +INCLUDES = -I$(srcdir)/../include -I../include \ + -I$(srcdir)/.. -I$(top_srcdir) -I.. include $(srcdir)/Makefile.shared diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index 223518e99d7..b6d0f93cbba 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -20,8 +20,6 @@ MYSQLDATAdir = $(localstatedir) MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) -INCLUDES = -I$(srcdir)/../include -I../include \ - -I$(srcdir)/.. -I$(top_srcdir) -I.. ## We'll use CLIENT_EXTRA_LDFLAGS for threaded and non-threaded ## until someone complains that they need separate options. LDADD = @CLIENT_EXTRA_LDFLAGS@ $(target) diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am index 424e6bdf854..52b0c715008 100644 --- a/libmysql_r/Makefile.am +++ b/libmysql_r/Makefile.am @@ -15,12 +15,15 @@ # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, # MA 02111-1307, USA -# This file is public domain and comes with NO WARRANTY of any kind + target = libmysqlclient_r.la target_defs = ## LIBS = @LIBS@ +INCLUDES = @MT_INCLUDES@ -I$(srcdir)/../include -I../include \ + -I$(srcdir)/.. -I$(top_srcdir) -I.. + ## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include include $(top_srcdir)/libmysql/Makefile.shared |