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 | 46b0cf80477b6177b502e207e92d5216bfdf30a3 (patch) | |
| tree | c158b10ebdd3c5772e60cfbcc0aa949373ccc103 /extra/yassl/src | |
| parent | 77435f0fbd79df432a2e617d143fb3e2895192d0 (diff) | |
| parent | 8639ad0f9857053a996e6a40d46126eceb9c2f0c (diff) | |
| download | mariadb-git-46b0cf80477b6177b502e207e92d5216bfdf30a3.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 'extra/yassl/src')
| -rw-r--r-- | extra/yassl/src/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/extra/yassl/src/Makefile.am b/extra/yassl/src/Makefile.am index 910bbbdd13f..bc57e7d05ba 100644 --- a/extra/yassl/src/Makefile.am +++ b/extra/yassl/src/Makefile.am @@ -1,4 +1,4 @@ -INCLUDES = -I../include -I../taocrypt/include -I../taocrypt/mySTL +INCLUDES = -I$(srcdir)/../include -I$(srcdir)/../taocrypt/include -I$(srcdir)/../taocrypt/mySTL noinst_LTLIBRARIES = libyassl.la libyassl_la_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \ |