summaryrefslogtreecommitdiff
path: root/libmysql
diff options
context:
space:
mode:
authorkent@kent-amd64.(none) <>2006-11-27 23:12:05 +0100
committerkent@kent-amd64.(none) <>2006-11-27 23:12:05 +0100
commite99c548bcd414b2149ce7c1a09619101d765dfd0 (patch)
treebb94dba41000bf4e2bcc5bd5ebbfe118fb9db103 /libmysql
parentfc49099e2072eeeaa935da879b4ae22f15a7ade9 (diff)
parent5fcb7a4ef11df88f963f41252121fabc7e39b5c1 (diff)
downloadmariadb-git-e99c548bcd414b2149ce7c1a09619101d765dfd0.tar.gz
Merge mysql.com:/home/kent/bk/mysql-5.0
into mysql.com:/home/kent/bk/mysql-5.1
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