Additional "make distcheck" changes specific to 5.0

configure.in:
  Removed duplicate "tools/Makefile", and unused AVAILABLE_LANGUAGES_ERRORS
Docs/Makefile.am:
  Add generated files to explicitly be removed on "make distclean"
extra/Makefile.am:
  Added empty SUBDIRS, else automake 1.6.3 will not
  put out code for DIST_SUBDIRS handling
extra/yassl/Makefile.am:
  "make distcheck" fails on normal wildcards, seem to work with $(wildcard foo*) type
extra/yassl/src/Makefile.am:
  "make distcheck" fails on normal wildcards, seem to work with $(wildcard foo*) type
extra/yassl/taocrypt/src/Makefile.am:
  "make distcheck" fails on normal wildcards, seem to work with $(wildcard foo*) type
sql/share/Makefile.am:
  Added distclean target for "*/errmsg.sys"
client/Makefile.am:
  Put links into current directory, not \$(srcdir)

9 files changed, 20 insertions, 10 deletions

diff --git a/Docs/Makefile.am b/Docs/Makefile.am
index 685eaeef7d1..542c82d8f58 100644
--- a/Docs/Makefile.am
+++ b/Docs/Makefile.am
@@ -33,6 +33,11 @@ install-data-hook:	mysql.info
 uninstall-local:
 	@RM@ -f $(DESTDIR)$(infodir)/mysql.info
 
+# Problems with "make distclean", works differently for make files
+# generated by different versions of the automake. Some require the
+# generated files explicitly in DISTCLEANFILES.
+DISTCLEANFILES = $(TXT_FILES)
+
 # This target is not used in builds, just for convinience
 CLEAN_FILES:		$(TXT_FILES)
 	touch $(TXT_FILES)
diff --git a/client/Makefile.am b/client/Makefile.am
index b1821c54b60..804f194085f 100644
--- a/client/Makefile.am
+++ b/client/Makefile.am
@@ -61,7 +61,7 @@ link_sources:
          done; \
         for f in $(strings_src) ; do \
           rm -f $(srcdir)/$$f; \
-          @LN_CP_F@ $(top_srcdir)/strings/$$f $(srcdir)/$$f; \
+          @LN_CP_F@ $(top_srcdir)/strings/$$f $$f; \
          done;
 
 # Don't update the files from bitkeeper
diff --git a/configure.in b/configure.in
index de162cdcd54..fa03aa08508 100644
--- a/configure.in
+++ b/configure.in
@@ -71,7 +71,6 @@ AC_DEFINE_UNQUOTED([DOT_FRM_VERSION], [$DOT_FRM_VERSION],
                    [Version of .frm files])
 AC_SUBST(SHARED_LIB_VERSION)
 AC_SUBST(AVAILABLE_LANGUAGES)
-AC_SUBST(AVAILABLE_LANGUAGES_ERRORS)
 
 AC_SUBST([NDB_VERSION_MAJOR])
 AC_SUBST([NDB_VERSION_MINOR])
@@ -2753,7 +2752,7 @@ AC_CONFIG_FILES(Makefile extra/Makefile mysys/Makefile dnl
  pstack/Makefile pstack/aout/Makefile sql/Makefile sql/share/Makefile dnl
  sql-common/Makefile SSL/Makefile dnl
  dbug/Makefile scripts/Makefile dnl
- include/Makefile sql-bench/Makefile tools/Makefile dnl
+ include/Makefile sql-bench/Makefile dnl
  server-tools/Makefile server-tools/instance-manager/Makefile dnl
  tests/Makefile Docs/Makefile support-files/Makefile dnl
  support-files/MacOSX/Makefile mysql-test/Makefile dnl
diff --git a/extra/Makefile.am b/extra/Makefile.am
index 457fddce673..a60656cb5c6 100644
--- a/extra/Makefile.am
+++ b/extra/Makefile.am
@@ -23,6 +23,9 @@ BUILT_SOURCES=		$(top_builddir)/include/mysqld_error.h \
                         $(top_builddir)/include/mysqld_ername.h
 pkginclude_HEADERS=	$(BUILT_SOURCES)
 CLEANFILES =		$(BUILT_SOURCES)
+# We never use SUBDIRS here, but needed for automake 1.6.3
+# to generate code to handle DIST_SUBDIRS
+SUBDIRS=
 DIST_SUBDIRS=           yassl
 
 # This will build mysqld_error.h and sql_state.h
diff --git a/extra/yassl/Makefile.am b/extra/yassl/Makefile.am
index 7c1f2ea5acb..41c4d84f24f 100644
--- a/extra/yassl/Makefile.am
+++ b/extra/yassl/Makefile.am
@@ -1,2 +1,2 @@
 SUBDIRS = taocrypt src
-EXTRA_DIST = yassl.dsp yassl.dsw mySTL/*.hpp
+EXTRA_DIST = yassl.dsp yassl.dsw $(wildcard mySTL/*.hpp)
diff --git a/extra/yassl/src/Makefile.am b/extra/yassl/src/Makefile.am
index 4ebb9a2d862..df96018e1cf 100644
--- a/extra/yassl/src/Makefile.am
+++ b/extra/yassl/src/Makefile.am
@@ -4,5 +4,5 @@ noinst_LIBRARIES = libyassl.a
 libyassl_a_SOURCES = buffer.cpp cert_wrapper.cpp crypto_wrapper.cpp \
 	handshake.cpp lock.cpp log.cpp socket_wrapper.cpp ssl.cpp \
 	template_instnt.cpp timer.cpp yassl_imp.cpp yassl_error.cpp yassl_int.cpp
-EXTRA_DIST = ../include/*.hpp ../include/openssl/*.h
+EXTRA_DIST = $(wildcard ../include/*.hpp) $(wildcard ../include/openssl/*.h)
 AM_CXXFLAGS = -DYASSL_PURE_C
diff --git a/extra/yassl/taocrypt/src/Makefile.am b/extra/yassl/taocrypt/src/Makefile.am
index 9ce083e9e56..0319fc6057b 100644
--- a/extra/yassl/taocrypt/src/Makefile.am
+++ b/extra/yassl/taocrypt/src/Makefile.am
@@ -11,5 +11,5 @@ libtaocrypt_a_SOURCES  = aes.cpp aestables.cpp algebra.cpp arc4.cpp asn.cpp \
 	template_instnt.cpp
 libtaocrypt_a_LIBADD = libtaoint_a-integer.o
 
-EXTRA_DIST = ../include/*.hpp
+EXTRA_DIST = $(wildcard ../include/*.hpp)
 AM_CXXFLAGS = -DYASSL_PURE_C
diff --git a/server-tools/instance-manager/Makefile.am b/server-tools/instance-manager/Makefile.am
index 4fa2a0da405..7449735f0bf 100644
--- a/server-tools/instance-manager/Makefile.am
+++ b/server-tools/instance-manager/Makefile.am
@@ -53,12 +53,12 @@ libnet_a_LIBADD= $(top_builddir)/sql/password.$(OBJEXT) \
 CLEANFILES= net_serv.cc client_settings.h
 
 net_serv.cc:
-	rm -f $(srcdir)/net_serv.cc
-	@LN_CP_F@ $(top_srcdir)/sql/net_serv.cc $(srcdir)/net_serv.cc
+	rm -f net_serv.cc
+	@LN_CP_F@ $(top_srcdir)/sql/net_serv.cc net_serv.cc
 
 client_settings.h:
-	rm -f $(srcdir)/client_settings.h
-	@LN_CP_F@ $(top_srcdir)/sql/client_settings.h $(srcdir)/client_settings.h
+	rm -f client_settings.h
+	@LN_CP_F@ $(top_srcdir)/sql/client_settings.h client_settings.h
 
 libexec_PROGRAMS= mysqlmanager
 
diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am
index d860b2b40c1..6d905ba35dc 100644
--- a/sql/share/Makefile.am
+++ b/sql/share/Makefile.am
@@ -53,6 +53,9 @@ install-data-local:
 uninstall-local:
 	@RM@ -f -r $(DESTDIR)$(pkgdatadir)
 
+distclean-local:
+	@RM@ -f */errmsg.sys
+
 # Do nothing
 link_sources: