Bug #35250: readline check breaks when doing vpath build

MySQL uses two source layouts when building : the bzr 
layout and the source package layout.
The previous fix for bug 35250 contained 1 change that is
valid for both modes and a number of changes that are valid
only for the bzr source layout.
The important thing was to fix the source package layout.
And for this the change in configure.in was sufficient.
It's not trivial (and not requested by this bug) to support 
VPATH builds from the bzr trees.
This is why the other changes are reverted and the change to
fix the VPATH build for source distributions is left intact.

4 files changed, 9 insertions, 10 deletions

diff --git a/mysql-test/Makefile.am b/mysql-test/Makefile.am
index 31770592d53..b1d0e85c70e 100644
--- a/mysql-test/Makefile.am
+++ b/mysql-test/Makefile.am
@@ -130,12 +130,12 @@ uninstall-local:
 # mtr - a shortcut for executing mysql-test-run.pl
 mtr:
 	$(RM) -f mtr
-	$(LN_S) $(srcdir)/mysql-test-run.pl mtr
+	$(LN_S) mysql-test-run.pl mtr
 
 # mysql-test-run - a shortcut for executing mysql-test-run.pl
 mysql-test-run:
 	$(RM) -f mysql-test-run
-	$(LN_S) $(srcdir)/mysql-test-run.pl mysql-test-run
+	$(LN_S) mysql-test-run.pl mysql-test-run
 
 # Don't update the files from bitkeeper
 %::SCCS/s.%
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 1aa24c5d432..0292617c7a5 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -110,8 +110,7 @@ mysqlbug: ${top_builddir}/config.status mysqlbug.sh
 mysql_fix_privilege_tables.sql: mysql_system_tables.sql \
 				mysql_system_tables_fix.sql
 	@echo "Building $@";
-	@cat $(srcdir)/mysql_system_tables.sql \
-	  $(srcdir)/mysql_system_tables_fix.sql > $@
+	@cat mysql_system_tables.sql mysql_system_tables_fix.sql > $@
 
 #
 # Build mysql_fix_privilege_tables_sql.c from
@@ -124,7 +123,7 @@ mysql_fix_privilege_tables_sql.c: comp_sql.c mysql_fix_privilege_tables.sql
 	sleep 2
 	$(top_builddir)/scripts/comp_sql$(EXEEXT) \
 	  mysql_fix_privilege_tables \
-	    $(top_builddir)/scripts/mysql_fix_privilege_tables.sql $@
+	    $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@
 
 
 SUFFIXES = .sh
diff --git a/sql/share/Makefile.am b/sql/share/Makefile.am
index 357f9ac0876..68b393e619f 100644
--- a/sql/share/Makefile.am
+++ b/sql/share/Makefile.am
@@ -22,7 +22,7 @@ dist-hook:
 	  test -d $(distdir)/$$dir || mkdir $(distdir)/$$dir; \
 	  $(INSTALL_DATA) $(srcdir)/$$dir/*.* $(distdir)/$$dir; \
 	done; \
-	sleep 1 ; touch $(builddir)/*/errmsg.sys
+	sleep 1 ; touch $(srcdir)/*/errmsg.sys
 	$(INSTALL_DATA) $(srcdir)/charsets/README $(distdir)/charsets
 	$(INSTALL_DATA) $(srcdir)/charsets/Index.xml $(distdir)/charsets
 
@@ -39,11 +39,11 @@ install-data-local:
 	for lang in @AVAILABLE_LANGUAGES@; \
 	do \
 		$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/$$lang; \
-		$(INSTALL_DATA) $(builddir)/$$lang/errmsg.sys \
+		$(INSTALL_DATA) $(srcdir)/$$lang/errmsg.sys \
 			        $(DESTDIR)$(pkgdatadir)/$$lang/errmsg.sys; \
 	done
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/charsets
-		$(INSTALL_DATA) $(builddir)/errmsg.txt \
+		$(INSTALL_DATA) $(srcdir)/errmsg.txt \
 	        $(DESTDIR)$(pkgdatadir)/errmsg.txt; \
 	$(INSTALL_DATA) $(srcdir)/charsets/README $(DESTDIR)$(pkgdatadir)/charsets/README
 	$(INSTALL_DATA) $(srcdir)/charsets/*.xml $(DESTDIR)$(pkgdatadir)/charsets
@@ -53,7 +53,7 @@ uninstall-local:
 	@RM@ -f -r $(DESTDIR)$(pkgdatadir)
 
 distclean-local:
-	@RM@ -f $(builddir)/*/errmsg.sys
+	@RM@ -f */errmsg.sys
 
 # Do nothing
 link_sources:
diff --git a/storage/ndb/src/common/util/Makefile.am b/storage/ndb/src/common/util/Makefile.am
index 5cf02fed12f..5379a425c49 100644
--- a/storage/ndb/src/common/util/Makefile.am
+++ b/storage/ndb/src/common/util/Makefile.am
@@ -37,7 +37,7 @@ testBitmask_LDFLAGS = @ndb_bin_am_ldflags@ \
 
 testBitmask.cpp : Bitmask.cpp
 	rm -f testBitmask.cpp
-	@LN_CP_F@ $(srcdir)/Bitmask.cpp testBitmask.cpp
+	@LN_CP_F@ Bitmask.cpp testBitmask.cpp
 
 testBitmask.o:	$(testBitmask_SOURCES)
 		$(CXXCOMPILE) -c $(INCLUDES) -D__TEST_BITMASK__ $<