Makefile.am:

  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir


client/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
cmd-line-utils/libedit/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
dbug/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
extra/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
heap/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
isam/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysql/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysql_r/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysqld/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
libmysqld/examples/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
merge/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
myisam/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
myisammrg/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
mysql-test/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
mysys/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
netware/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
regex/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
sql/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
strings/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
tests/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
vio/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir
tools/Makefile.am:
  Added -I$(top_builddir)/include for searching
  generated header files, when builddir != srcdir

23 files changed, 48 insertions, 28 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
diff --git a/cmd-line-utils/libedit/Makefile.am b/cmd-line-utils/libedit/Makefile.am
index 03f3eb65fbc..af1bf8b2c97 100644
--- a/cmd-line-utils/libedit/Makefile.am
+++ b/cmd-line-utils/libedit/Makefile.am
@@ -5,7 +5,8 @@
 ASRC=vi.c emacs.c common.c
 AHDR=vi.h emacs.h common.h
 
-INCLUDES =		-I$(top_srcdir)/include -I$(srcdir)/../.. -I..
+INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
+			-I$(srcdir)/../.. -I..
 
 noinst_LIBRARIES =	libedit.a
 
diff --git a/cmd-line-utils/readline/Makefile.am b/cmd-line-utils/readline/Makefile.am
index 87880517166..14d25ff62c0 100644
--- a/cmd-line-utils/readline/Makefile.am
+++ b/cmd-line-utils/readline/Makefile.am
@@ -3,7 +3,8 @@
 # Copyright (C) 1994,1996,1997 Free Software Foundation, Inc.
 
 # Last  -I$(top_srcdir) needed for RedHat!
-INCLUDES =		-I$(top_srcdir)/include -I$(top_srcdir)
+INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
+			-I$(top_srcdir)
 
 noinst_LIBRARIES =	libreadline.a
 
diff --git a/dbug/Makefile.am b/dbug/Makefile.am
index bd512ee1d1d..3ddb5bc17e1 100644
--- a/dbug/Makefile.am
+++ b/dbug/Makefile.am
@@ -15,7 +15,8 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA
 
-INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include
+INCLUDES =		@MT_INCLUDES@ \
+			-I$(top_builddir)/include -I$(top_srcdir)/include
 LDADD =			libdbug.a ../strings/libmystrings.a
 pkglib_LIBRARIES =	libdbug.a
 noinst_HEADERS =	dbug_long.h
diff --git a/extra/Makefile.am b/extra/Makefile.am
index aec7ad7dda5..467f426f1a5 100644
--- a/extra/Makefile.am
+++ b/extra/Makefile.am
@@ -14,7 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include \
+INCLUDES =		@MT_INCLUDES@ \
+			-I$(top_builddir)/include -I$(top_srcdir)/include \
 			@ndbcluster_includes@ -I$(top_srcdir)/sql
 LDADD =			@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
 			../dbug/libdbug.a ../strings/libmystrings.a
diff --git a/heap/Makefile.am b/heap/Makefile.am
index ec631148dce..9ce09757802 100644
--- a/heap/Makefile.am
+++ b/heap/Makefile.am
@@ -14,7 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include 
+INCLUDES =		@MT_INCLUDES@ \
+			-I$(top_builddir)/include -I$(top_srcdir)/include 
 LDADD =			libheap.a ../mysys/libmysys.a ../dbug/libdbug.a \
 			../strings/libmystrings.a
 pkglib_LIBRARIES =	libheap.a
diff --git a/isam/Makefile.am b/isam/Makefile.am
index 6d9e4176d43..335346d2423 100644
--- a/isam/Makefile.am
+++ b/isam/Makefile.am
@@ -14,7 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include 
+INCLUDES =		@MT_INCLUDES@ \
+			-I$(top_builddir)/include -I$(top_srcdir)/include 
 LDADD =			@CLIENT_EXTRA_LDFLAGS@ libnisam.a ../mysys/libmysys.a \
 			../dbug/libdbug.a ../strings/libmystrings.a
 pkglib_LIBRARIES =	libnisam.a
diff --git a/libmysql/Makefile.am b/libmysql/Makefile.am
index 72ff44ecef3..4bd9eddafb0 100644
--- a/libmysql/Makefile.am
+++ b/libmysql/Makefile.am
@@ -23,7 +23,8 @@
 target =	libmysqlclient.la
 target_defs =	-DUNDEF_THREADS_HACK -DDONT_USE_RAID @LIB_EXTRA_CCFLAGS@
 LIBS =		@CLIENT_LIBS@
-INCLUDES =	-I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@
+INCLUDES =	-I$(top_builddir)/include -I$(top_srcdir)/include \
+		$(openssl_includes) @ZLIB_INCLUDES@
 
 include $(srcdir)/Makefile.shared
 
diff --git a/libmysql_r/Makefile.am b/libmysql_r/Makefile.am
index 0a5c380ff35..a76ef675189 100644
--- a/libmysql_r/Makefile.am
+++ b/libmysql_r/Makefile.am
@@ -24,8 +24,9 @@ target = libmysqlclient_r.la
 target_defs = -DDONT_USE_RAID -DMYSQL_CLIENT @LIB_EXTRA_CCFLAGS@
 LIBS = @LIBS@ @ZLIB_LIBS@ @openssl_libs@
 
-INCLUDES = @MT_INCLUDES@ \
-	   -I$(top_srcdir)/include $(openssl_includes) @ZLIB_INCLUDES@
+INCLUDES =	@MT_INCLUDES@ \
+		-I$(top_builddir)/include -I$(top_srcdir)/include \
+		$(openssl_includes) @ZLIB_INCLUDES@
 
 ## automake barfs if you don't use $(srcdir) or $(top_srcdir) in include
 include $(top_srcdir)/libmysql/Makefile.shared
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am
index f578e87ae4a..f4e9d4e6b39 100644
--- a/libmysqld/Makefile.am
+++ b/libmysqld/Makefile.am
@@ -25,7 +25,8 @@ DEFS =			-DEMBEDDED_LIBRARY -DMYSQL_SERVER \
 			-DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \
 			-DDATADIR="\"$(MYSQLDATAdir)\"" \
 			-DSHAREDIR="\"$(MYSQLSHAREdir)\""
-INCLUDES=		@MT_INCLUDES@ @bdb_includes@ -I$(top_srcdir)/include \
+INCLUDES=		@MT_INCLUDES@ @bdb_includes@ \
+			-I$(top_builddir)/include -I$(top_srcdir)/include \
 			-I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples -I$(top_srcdir)/regex \
 			$(openssl_includes) @ZLIB_INCLUDES@
 
diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am
index 278aa66b328..d19023c100f 100644
--- a/libmysqld/examples/Makefile.am
+++ b/libmysqld/examples/Makefile.am
@@ -30,7 +30,8 @@ link_sources:
 	done;
 
 DEFS = 		-DEMBEDDED_LIBRARY
-INCLUDES =	@MT_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir) \
+INCLUDES =	@MT_INCLUDES@ \
+		-I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \
 		-I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \
 		$(openssl_includes)
 LIBS =		@LIBS@ @WRAPLIBS@ @CLIENT_LIBS@
diff --git a/merge/Makefile.am b/merge/Makefile.am
index 25e15e9c6ec..080e5e61747 100644
--- a/merge/Makefile.am
+++ b/merge/Makefile.am
@@ -14,7 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include
+INCLUDES =		@MT_INCLUDES@ \
+			-I$(top_builddir)/include -I$(top_srcdir)/include
 pkglib_LIBRARIES =	libmerge.a
 noinst_HEADERS =	mrg_def.h
 libmerge_a_SOURCES =	mrg_open.c mrg_extra.c mrg_info.c mrg_locking.c \
diff --git a/myisam/Makefile.am b/myisam/Makefile.am
index 0b8a25e3404..6f304c8143d 100644
--- a/myisam/Makefile.am
+++ b/myisam/Makefile.am
@@ -17,7 +17,8 @@
 EXTRA_DIST =		mi_test_all.sh mi_test_all.res
 pkgdata_DATA =		mi_test_all mi_test_all.res
 
-INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include
+INCLUDES =		@MT_INCLUDES@ \
+			-I$(top_builddir)/include -I$(top_srcdir)/include
 LDADD =			@CLIENT_EXTRA_LDFLAGS@ libmyisam.a \
 			$(top_builddir)/mysys/libmysys.a \
 			$(top_builddir)/dbug/libdbug.a \
diff --git a/myisammrg/Makefile.am b/myisammrg/Makefile.am
index b5b1260385b..3cd8cfdedea 100644
--- a/myisammrg/Makefile.am
+++ b/myisammrg/Makefile.am
@@ -14,7 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include
+INCLUDES =		@MT_INCLUDES@ \
+			-I$(top_builddir)/include -I$(top_srcdir)/include
 pkglib_LIBRARIES =	libmyisammrg.a
 noinst_HEADERS =	myrg_def.h
 libmyisammrg_a_SOURCES = myrg_open.c myrg_extra.c myrg_info.c myrg_locking.c \
diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 0c27edb02e7..e7abcd3fc95 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -39,7 +39,7 @@ test_DATA = std_data/client-key.pem std_data/client-cert.pem std_data/cacert.pem
 	std_data/server-cert.pem std_data/server-key.pem 
 CLEANFILES = 		$(test_SCRIPTS) $(test_DATA)
 
-INCLUDES =		-I$(srcdir)/../include -I../include -I..
+INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include -I..
 EXTRA_PROGRAMS =	mysql_test_run_new
 noinst_HEADERS =	my_manage.h
 mysql_test_run_new_SOURCES=		mysql_test_run_new.c my_manage.c my_create_tables.c
diff --git a/mysys/Makefile.am b/mysys/Makefile.am
index ab35ccb21ba..a80df810c1c 100644
--- a/mysys/Makefile.am
+++ b/mysys/Makefile.am
@@ -18,7 +18,8 @@ MYSQLDATAdir =		$(localstatedir)
 MYSQLSHAREdir =		$(pkgdatadir)
 MYSQLBASEdir=		$(prefix)
 INCLUDES =		@MT_INCLUDES@ \
-                        @ZLIB_INCLUDES@ -I$(top_srcdir)/include -I$(srcdir)
+                        @ZLIB_INCLUDES@ -I$(top_builddir)/include \
+			-I$(top_srcdir)/include -I$(srcdir)
 pkglib_LIBRARIES =	libmysys.a
 LDADD =			libmysys.a ../dbug/libdbug.a \
 			../strings/libmystrings.a
diff --git a/netware/Makefile.am b/netware/Makefile.am
index 2467270f27b..aeb93d1575d 100644
--- a/netware/Makefile.am
+++ b/netware/Makefile.am
@@ -15,7 +15,7 @@
 #  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
 
 if HAVE_NETWARE
-INCLUDES =			-I$(srcdir)/../include -I../include -I..
+INCLUDES =			-I$(top_builddir)/include -I$(top_srcdir)/include -I..
 LDADD =				@CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \
 				../dbug/libdbug.a ../strings/libmystrings.a
 bin_PROGRAMS =			mysqld_safe mysql_install_db mysql_test_run libmysql
diff --git a/regex/Makefile.am b/regex/Makefile.am
index ee7fc5463b7..bcba6818b1b 100644
--- a/regex/Makefile.am
+++ b/regex/Makefile.am
@@ -15,7 +15,8 @@
 # Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA
 
-INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include
+INCLUDES =		@MT_INCLUDES@ \
+			-I$(top_builddir)/include -I$(top_srcdir)/include
 noinst_LIBRARIES =	libregex.a
 LDADD=			libregex.a $(top_builddir)/strings/libmystrings.a
 noinst_HEADERS =	cclass.h cname.h regex2.h utils.h engine.c regex.h
diff --git a/sql/Makefile.am b/sql/Makefile.am
index a76adbd0d57..ea7cea9c7b9 100644
--- a/sql/Makefile.am
+++ b/sql/Makefile.am
@@ -21,8 +21,8 @@ MYSQLSHAREdir =		$(pkgdatadir)
 MYSQLBASEdir=		$(prefix)
 INCLUDES =		@MT_INCLUDES@ @ZLIB_INCLUDES@ \
 			@bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \
-			-I$(top_srcdir)/include -I$(top_srcdir)/regex \
-			-I$(srcdir) $(openssl_includes)
+			-I$(top_builddir)/include -I$(top_srcdir)/include \
+			-I$(top_srcdir)/regex -I$(srcdir) $(openssl_includes)
 WRAPLIBS=		@WRAPLIBS@
 SUBDIRS =		share
 libexec_PROGRAMS =	mysqld
diff --git a/strings/Makefile.am b/strings/Makefile.am
index fa149817270..3f954f3c6a0 100644
--- a/strings/Makefile.am
+++ b/strings/Makefile.am
@@ -16,7 +16,8 @@
 
 # This file is public domain and comes with NO WARRANTY of any kind
 
-INCLUDES =		@MT_INCLUDES@ -I$(top_srcdir)/include
+INCLUDES =		@MT_INCLUDES@ \
+			-I$(top_builddir)/include -I$(top_srcdir)/include
 pkglib_LIBRARIES =	libmystrings.a
 
 # Exact one of ASSEMBLER_X
diff --git a/tests/Makefile.am b/tests/Makefile.am
index de4fbb2a4f2..3c781b7e45b 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -32,7 +32,8 @@ noinst_PROGRAMS =	insert_test select_test thread_test
 #
 # C Test for 4.1 protocol
 #
-INCLUDES =		-I$(top_srcdir)/include $(openssl_includes)
+INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
+			$(openssl_includes)
 LIBS =			@CLIENT_LIBS@
 LDADD =			@CLIENT_EXTRA_LDFLAGS@ ../libmysql/libmysqlclient.la
 mysql_client_test_LDADD=      $(LDADD) $(CXXLDFLAGS)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 5528df4dd68..bf81005ca2c 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -15,9 +15,11 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 # Process this file with automake to create Makefile.in
 
-INCLUDES=@MT_INCLUDES@ -I$(top_srcdir)/include $(openssl_includes)
-LDADD=  @CLIENT_EXTRA_LDFLAGS@ @openssl_libs@ \
-	$(top_builddir)/libmysql_r/libmysqlclient_r.la @ZLIB_LIBS@ 
+INCLUDES=		@MT_INCLUDES@ -I$(top_builddir)/include \
+			-I$(top_srcdir)/include $(openssl_includes)
+LDADD=			@CLIENT_EXTRA_LDFLAGS@ @openssl_libs@ \
+			$(top_builddir)/libmysql_r/libmysqlclient_r.la \
+			@ZLIB_LIBS@ 
 bin_PROGRAMS=		mysqlmanager
 mysqlmanager_SOURCES=	mysqlmanager.c
 mysqlmanager_DEPENDENCIES=	$(LIBRARIES) $(pkglib_LTLIBRARIES)
diff --git a/vio/Makefile.am b/vio/Makefile.am
index 9c961025080..e27daa7ac35 100644
--- a/vio/Makefile.am
+++ b/vio/Makefile.am
@@ -14,7 +14,8 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
-INCLUDES=		-I$(top_srcdir)/include $(openssl_includes)
+INCLUDES=		-I$(top_builddir)/include -I$(top_srcdir)/include \
+			$(openssl_includes)
 LDADD=			@CLIENT_EXTRA_LDFLAGS@ $(openssl_libs) 
 pkglib_LIBRARIES=	libvio.a
 noinst_PROGRAMS	=	test-ssl test-sslserver test-sslclient