Makefile.am:

  Change for 'make distcheck'
libmysqld.vcproj:
  Typo


VC++Files/libmysqld/libmysqld.vcproj:
  Typo
mysql-test/ndb/Makefile.am:
  Change for 'make distcheck'
storage/archive/Makefile.am:
  Change for 'make distcheck'
plugin/fulltext/Makefile.am:
  Change for 'make distcheck'
storage/csv/Makefile.am:
  Change for 'make distcheck'
storage/heap/Makefile.am:
  Change for 'make distcheck'

6 files changed, 14 insertions, 9 deletions

diff --git a/VC++Files/libmysqld/libmysqld.vcproj b/VC++Files/libmysqld/libmysqld.vcproj
index 8130a2c95f3..2ca2401826d 100644
--- a/VC++Files/libmysqld/libmysqld.vcproj
+++ b/VC++Files/libmysqld/libmysqld.vcproj
@@ -157,7 +157,7 @@
 				InlineFunctionExpansion="1"
 				OptimizeForProcessor="2"
 				AdditionalIncludeDirectories="../include,../libmysqld,../sql,../regex,../extra/yassl/include,../storage/bdb/build_win32,../zlib"
-				PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;NDEBUG;DBUG_OFF;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;WITH_INNOBASE_STORAGE_ENGINE;USE_TLS;__WIN__"/>
+				PreprocessorDefinitions="WIN32;_WINDOWS;_MBCS;NDEBUG;DBUG_OFF;USE_SYMDIR;SIGNAL_WITH_VIO_CLOSE;HAVE_DLOPEN;EMBEDDED_LIBRARY;MYSQL_SERVER;HAVE_INNOBASE_DB;WITH_INNOBASE_STORAGE_ENGINE;USE_TLS;__WIN__"
 				StringPooling="TRUE"
 				RuntimeLibrary="0"
 				EnableFunctionLevelLinking="TRUE"
diff --git a/mysql-test/ndb/Makefile.am b/mysql-test/ndb/Makefile.am
index 1ef02bec1f0..2a1c59fd359 100644
--- a/mysql-test/ndb/Makefile.am
+++ b/mysql-test/ndb/Makefile.am
@@ -1,4 +1,6 @@
 
+BUILT_SOURCES =		ndbcluster
+
 benchdir_root=		$(prefix)
 testdir =	        $(benchdir_root)/mysql-test/ndb
 
diff --git a/plugin/fulltext/Makefile.am b/plugin/fulltext/Makefile.am
index 0a3186829da..e5a70a23beb 100644
--- a/plugin/fulltext/Makefile.am
+++ b/plugin/fulltext/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES= -I$(top_builddir)/include
+INCLUDES= -I$(top_builddir)/include -I$(top_srcdir)/include
 noinst_LTLIBRARIES= mypluglib.la
 mypluglib_la_SOURCES= plugin_example.c
 mypluglib_la_LDFLAGS= -module -rpath $(pkglibdir)
diff --git a/storage/archive/Makefile.am b/storage/archive/Makefile.am
index fabeca81eda..c2ae9d6b728 100644
--- a/storage/archive/Makefile.am
+++ b/storage/archive/Makefile.am
@@ -17,9 +17,10 @@
 INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include \
 			@ZLIB_INCLUDES@
 
-LDADD =			libarchive.a $(top_srcdir)/mysys/libmysys.a \
-			$(top_srcdir)/dbug/libdbug.a \
-			$(top_srcdir)/strings/libmystrings.a \
+LDADD =			libarchive.a \
+			$(top_builddir)/mysys/libmysys.a \
+			$(top_builddir)/dbug/libdbug.a \
+			$(top_builddir)/strings/libmystrings.a \
 			@ZLIB_LIBS@
 pkglib_LIBRARIES =	libarchive.a
 noinst_PROGRAMS	=	archive_test
diff --git a/storage/csv/Makefile.am b/storage/csv/Makefile.am
index 509cef954ff..5573df720a3 100644
--- a/storage/csv/Makefile.am
+++ b/storage/csv/Makefile.am
@@ -20,7 +20,8 @@ MYSQLDATAdir =          $(localstatedir)
 MYSQLSHAREdir =         $(pkgdatadir)
 MYSQLBASEdir=           $(prefix)
 MYSQLLIBdir=            $(pkglibdir)
-INCLUDES =              -I$(top_srcdir)/include \
+INCLUDES =              -I$(top_builddir)/include \
+			-I$(top_srcdir)/include \
 			-I$(top_srcdir)/regex \
 			-I$(top_srcdir)/sql \
                         -I$(srcdir)
diff --git a/storage/heap/Makefile.am b/storage/heap/Makefile.am
index 2890dc6ee23..79e0379f9a4 100644
--- a/storage/heap/Makefile.am
+++ b/storage/heap/Makefile.am
@@ -15,9 +15,10 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
 INCLUDES =		-I$(top_builddir)/include -I$(top_srcdir)/include 
-LDADD =			libheap.a $(top_srcdir)/mysys/libmysys.a \
-			$(top_srcdir)/dbug/libdbug.a \
-			$(top_srcdir)/strings/libmystrings.a
+LDADD =			libheap.a \
+			$(top_builddir)/mysys/libmysys.a \
+			$(top_builddir)/dbug/libdbug.a \
+			$(top_builddir)/strings/libmystrings.a
 pkglib_LIBRARIES =	libheap.a
 noinst_PROGRAMS	=	hp_test1 hp_test2
 hp_test1_LDFLAGS = @NOINST_LDFLAGS@