Makefile.am:

  Add an extra -lpthread before first -lc, to solve link
  problems when statically linking with glibc 2.2.5
make_win_src_distribution.sh:
  Added copying of the include/mysql directory


scripts/make_win_src_distribution.sh:
  Added copying of the include/mysql directory
client/Makefile.am:
  Add redundant CLIENT_THREAD_LIBS to LDADD, to make -lpthread go before
  -lc, required for the static linking with glibc 2.2.5 to work.

client/Makefile.am

@@ -27,7 +27,7 @@ INCLUDES =			-I$(top_builddir)/include \
 				-I$(top_srcdir)/regex \
                                 $(openssl_includes) $(yassl_includes) 
 LIBS =				@CLIENT_LIBS@
-LDADD=				@CLIENT_EXTRA_LDFLAGS@ \
+LDADD=				@CLIENT_EXTRA_LDFLAGS@ $(CLIENT_THREAD_LIBS) \
                                 $(top_builddir)/libmysql/libmysqlclient.la
 bin_PROGRAMS =			mysql mysqladmin mysqlcheck mysqlshow \
 				mysqldump mysqlimport mysqltest mysqlbinlog \
@@ -57,7 +57,7 @@ mysqlcheck_SOURCES=             mysqlcheck.c $(yassl_dummy_link_fix)
 mysqlshow_SOURCES=              mysqlshow.c $(yassl_dummy_link_fix)
 mysqlslap_SOURCES=              mysqlslap.c $(top_srcdir)/mysys/my_lock.c \
 				$(top_srcdir)/mysys/my_alarm.c \
-  				$(yassl_dummy_link_fix)
+				$(yassl_dummy_link_fix)
 mysqldump_SOURCES=              mysqldump.c my_user.c $(yassl_dummy_link_fix)
 mysqlimport_SOURCES=            mysqlimport.c \
 				$(yassl_dummy_link_fix)
@@ -71,14 +71,14 @@ link_sources:
 	for f in $(sql_src) ; do \
 	  rm -f $$f; \
 	  @LN_CP_F@ $(top_srcdir)/sql/$$f $$f; \
-         done; \
+        done; \
         for f in $(strings_src) ; do \
           rm -f $(srcdir)/$$f; \
           @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
-         done; \
-         rm -f $(srcdir)/my_user.c; \
-         @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c;
-	
+        done; \
+        rm -f $(srcdir)/my_user.c; \
+        @LN_CP_F@ $(top_srcdir)/sql-common/my_user.c my_user.c
+
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%

scripts/make_win_src_distribution.sh

@@ -250,7 +250,7 @@ copy_dir_dirs() {
 #
 
 for i in client dbug extra storage/heap include storage/archive storage/example \
-         libmysql libmysqld storage/myisam storage/example \
+         include/mysql libmysql libmysqld storage/myisam storage/example \
          storage/myisammrg mysys regex sql strings sql-common sql/examples \
          tools vio zlib
 do