diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-08-02 12:56:54 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-08-02 12:56:54 +0200 |
| commit | 18b1828e7f3b3363ce18f89977dc1d59aaf1d8e2 (patch) | |
| tree | 3cfe4423fb968fccabba53b0d01f748152ef055b /scripts | |
| parent | 348114d7c479232f283964d02af10749d0d9b63c (diff) | |
| parent | 7bd93758abda81631c53d2a3a268f6db223951d9 (diff) | |
| download | mariadb-git-18b1828e7f3b3363ce18f89977dc1d59aaf1d8e2.tar.gz | |
Merge mysql.com:/home/kent/bk/cmake-tls/mysql-5.0-build
into mysql.com:/home/kent/bk/cmake-tls/mysql-5.1-build
BitKeeper/deleted/.del-CMakeLists.txt~13:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~14:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~3:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~8:
Auto merged
BitKeeper/deleted/.del-CMakeLists.txt~9:
Auto merged
scripts/make_win_bin_dist:
SCCS merged
Diffstat (limited to 'scripts')
| -rwxr-xr-x | scripts/make_win_bin_dist | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/make_win_bin_dist b/scripts/make_win_bin_dist index 480ea39b2cf..c08d595f65b 100755 --- a/scripts/make_win_bin_dist +++ b/scripts/make_win_bin_dist @@ -278,7 +278,7 @@ cp libmysql/libmysql.def $DESTDIR/include/ mkdir -p $DESTDIR/lib/opt cp libmysql/$TARGET/libmysql.dll \ libmysql/$TARGET/libmysql.lib \ - client/$TARGET/mysqlclient.lib \ + libmysql/$TARGET/mysqlclient.lib \ regex/$TARGET/regex.lib \ strings/$TARGET/strings.lib \ zlib/$TARGET/zlib.lib $DESTDIR/lib/opt/ @@ -288,7 +288,7 @@ if [ x"$PACK_DEBUG" = x"" -a -f "libmysql/debug/libmysql.lib" -o \ mkdir -p $DESTDIR/lib/debug cp libmysql/debug/libmysql.dll \ libmysql/debug/libmysql.lib \ - client/debug/mysqlclient.lib \ + libmysql/debug/mysqlclient.lib \ mysys/debug/mysys.lib \ regex/debug/regex.lib \ strings/debug/strings.lib \ |