summaryrefslogtreecommitdiff
path: root/client
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2005-07-06 00:15:55 +0200
committerunknown <kent@mysql.com>2005-07-06 00:15:55 +0200
commit97b4cf0edb4dda53da8799cc267f69e52f592596 (patch)
tree3e98c9c31b673673715271fd735b27e5198d77ae /client
parenta27b5b31fc425220e3efb29bf6d94adee240adc5 (diff)
parentb0a6a8e13780182a172b2c0a5b6ef008b6d0645f (diff)
downloadmariadb-git-97b4cf0edb4dda53da8799cc267f69e52f592596.tar.gz
Merge kboortz@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/Users/kent/mysql/bk/mysql-4.1-distcheck
Diffstat (limited to 'client')
-rw-r--r--client/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/client/Makefile.am b/client/Makefile.am
index da13c3e9763..1e8851fb3b9 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -17,8 +17,8 @@
# This file is public domain and comes with NO WARRANTY of any kind
#AUTOMAKE_OPTIONS = nostdinc
-INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/regex \
- $(openssl_includes)
+INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \
+ -I$(top_srcdir)/regex $(openssl_includes)
LIBS = @CLIENT_LIBS@
LDADD= @CLIENT_EXTRA_LDFLAGS@ \
$(top_builddir)/libmysql/libmysqlclient.la