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 | a18d3effc0f45b4b12d7dcba5ea7cfcf0f64e561 (patch) | |
| tree | 008e62aa129638def201d2a16080250762facf18 /libmysql | |
| parent | 76b4ccbdf8d4913993eb64ef08986654ac5f0423 (diff) | |
| parent | 90feb661d5af4de00eb4165e575c145f722b92c5 (diff) | |
| download | mariadb-git-a18d3effc0f45b4b12d7dcba5ea7cfcf0f64e561.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 |