summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorkent@kent-amd64.(none) <>2006-11-29 14:28:05 +0100
committerkent@kent-amd64.(none) <>2006-11-29 14:28:05 +0100
commit65183d54d2aaa7794b4f5f924f7043d7757ee951 (patch)
tree0ee6eeb1f7181479368c403d8a440911cfc29516 /libmysql
parent40684173ad1c4a0a64c8c5bccc0ac9ff1009d8bf (diff)
parentcc71956401f46112dae8e338909184196c60fc28 (diff)
downloadmariadb-git-65183d54d2aaa7794b4f5f924f7043d7757ee951.tar.gz
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/kent/bk/mysql-5.1-build
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