diff options
| author | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-11-27 21:45:16 +0100 |
|---|---|---|
| committer | unknown <kent@mysql.com/kent-amd64.(none)> | 2006-11-27 21:45:16 +0100 |
| commit | 048dfce072bb515f0e1e9bad30697246a1e107a9 (patch) | |
| tree | c158b10ebdd3c5772e60cfbcc0aa949373ccc103 /libmysql | |
| parent | 880b3d84d110a24ecb1fb7e053334f45d43b7210 (diff) | |
| parent | e9c502b3995c2e8dd0b5c3fb878e371a548989ba (diff) | |
| download | mariadb-git-048dfce072bb515f0e1e9bad30697246a1e107a9.tar.gz | |
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.0
into mysql.com:/home/kent/bk/mysql-5.0-merge
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 |