bzr commit into mysql-5.1-bugteam branch (joro:3379) Bug#35250

[Georgi Kodinov]

#At file:///Users/kgeorge/mysql/work/B35250-5.1-bugteam/ based on revid:luis.soares@stripped

 3379 Georgi Kodinov	2010-03-09
      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.

    modified:
      mysql-test/Makefile.am
      scripts/Makefile.am
      sql/share/Makefile.am
      storage/ndb/src/common/util/Makefile.am
=== modified file 'mysql-test/Makefile.am'
--- a/mysql-test/Makefile.am	2010-02-12 16:28:35 +0000
+++ b/mysql-test/Makefile.am	2010-03-09 15:51:31 +0000
@@ -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.%

=== modified file 'scripts/Makefile.am'
--- a/scripts/Makefile.am	2010-02-12 16:28:35 +0000
+++ b/scripts/Makefile.am	2010-03-09 15:51:31 +0000
@@ -110,8 +110,7 @@ mysqlbug: ${top_builddir}/config.status 
 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_s
 	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

=== modified file 'sql/share/Makefile.am'
--- a/sql/share/Makefile.am	2010-02-12 16:28:35 +0000
+++ b/sql/share/Makefile.am	2010-03-09 15:51:31 +0000
@@ -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:

=== modified file 'storage/ndb/src/common/util/Makefile.am'
--- a/storage/ndb/src/common/util/Makefile.am	2010-02-12 16:28:35 +0000
+++ b/storage/ndb/src/common/util/Makefile.am	2010-03-09 15:51:31 +0000
@@ -37,7 +37,7 @@ testBitmask_LDFLAGS = @ndb_bin_am_ldflag
 
 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__ $<


Attachment: [text/bzr-bundle] bzr/[e-mail]