diff options
| author | unknown <kent@kent-amd64.(none)> | 2006-11-28 18:31:53 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2006-11-28 18:31:53 +0100 |
| commit | 5d717e1a5320f34e90f1b74ef03ab345bb130bc9 (patch) | |
| tree | 008e62aa129638def201d2a16080250762facf18 /libmysql | |
| parent | 5b3fa09ba52c6b801f223fe9a392f0c017cc7282 (diff) | |
| parent | b23648804c422fb1bb938127e1f4d49e73c08f45 (diff) | |
| download | mariadb-git-5d717e1a5320f34e90f1b74ef03ab345bb130bc9.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/kent/bk/mysql-5.1-build
client/mysql_upgrade.c:
Auto merged
mysql-test/lib/mtr_report.pl:
Auto merged
sql-common/my_time.c:
Auto merged
Diffstat (limited to 'libmysql')
| -rw-r--r-- | libmysql/Makefile.shared | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index c2d98a81042..dc6d658fcdf 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -89,8 +89,8 @@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs) if HAVE_YASSL -yassl_las = $(top_srcdir)/extra/yassl/src/libyassl.la \ - $(top_srcdir)/extra/yassl/taocrypt/src/libtaocrypt.la +yassl_las = $(top_builddir)/extra/yassl/src/libyassl.la \ + $(top_builddir)/extra/yassl/taocrypt/src/libtaocrypt.la endif # The automatic dependencies miss this |