Commit 423fd0b0 authored by kent@kent-amd64.(none)'s avatar kent@kent-amd64.(none)

Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build

into  mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build
parents 9e756ab2 74267ad9
...@@ -278,7 +278,7 @@ cp libmysql/libmysql.def $DESTDIR/include/ ...@@ -278,7 +278,7 @@ cp libmysql/libmysql.def $DESTDIR/include/
mkdir -p $DESTDIR/lib/opt mkdir -p $DESTDIR/lib/opt
cp libmysql/$TARGET/libmysql.dll \ cp libmysql/$TARGET/libmysql.dll \
libmysql/$TARGET/libmysql.lib \ libmysql/$TARGET/libmysql.lib \
client/$TARGET/mysqlclient.lib \ libmysql/$TARGET/mysqlclient.lib \
regex/$TARGET/regex.lib \ regex/$TARGET/regex.lib \
strings/$TARGET/strings.lib \ strings/$TARGET/strings.lib \
zlib/$TARGET/zlib.lib $DESTDIR/lib/opt/ zlib/$TARGET/zlib.lib $DESTDIR/lib/opt/
...@@ -288,7 +288,7 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \ ...@@ -288,7 +288,7 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \
mkdir -p $DESTDIR/lib/debug mkdir -p $DESTDIR/lib/debug
cp libmysql/debug/libmysql.dll \ cp libmysql/debug/libmysql.dll \
libmysql/debug/libmysql.lib \ libmysql/debug/libmysql.lib \
client/debug/mysqlclient.lib \ libmysql/debug/mysqlclient.lib \
mysys/debug/mysys.lib \ mysys/debug/mysys.lib \
regex/debug/regex.lib \ regex/debug/regex.lib \
strings/debug/strings.lib \ strings/debug/strings.lib \
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment