summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorunknown <kent@kent-amd64.(none)>2006-11-29 14:28:05 +0100
committerunknown <kent@kent-amd64.(none)>2006-11-29 14:28:05 +0100
commite93a20a5fc4a968e011fd6137baa2fbb790b5278 (patch)
tree0ee6eeb1f7181479368c403d8a440911cfc29516 /libmysql
parentb51cf266293929dec21e41bdc97c4eead4884f0e (diff)
parent412d284e063471a17d4e445a9c80b9b0d1c40182 (diff)
downloadmariadb-git-e93a20a5fc4a968e011fd6137baa2fbb790b5278.tar.gz
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/kent/bk/mysql-5.1-build sql-common/my_time.c: Auto merged
Diffstat (limited to 'libmysql')
-rw-r--r--libmysql/Makefile.shared4
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