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

[Georgi Kodinov]

#At file:///home/kgeorge/mysql/work/B35250-5.1-bugteam/ based on revid:sergey.glukhov@stripped

 3382 Georgi Kodinov	2010-02-12
      Bug #35250: readline check breaks when doing vpath build
      
      Fixed several (obvious) places that don't work with vpath
      build.

    modified:
      configure.in
      mysql-test/Makefile.am
      scripts/Makefile.am
      sql/share/Makefile.am
      storage/ndb/src/common/util/Makefile.am
=== modified file 'configure.in'
--- a/configure.in	2010-02-04 19:32:25 +0000
+++ b/configure.in	2010-02-12 16:28:35 +0000
@@ -2705,7 +2705,7 @@ case $SYSTEM_TYPE in
     fi
 
     # if there is no readline, but we want to build with readline, we fail
-    if [test "$want_to_use_readline" = "yes"] && [test ! -d "./cmd-line-utils/readline"]
+    if [test "$want_to_use_readline" = "yes"] && [test ! -d "$srcdir/cmd-line-utils/readline"]
     then
 	AC_MSG_ERROR([This commercially licensed MySQL source package can't
 	      be built with libreadline. Please use --with-libedit to use

=== modified file 'mysql-test/Makefile.am'
--- a/mysql-test/Makefile.am	2009-10-13 18:21:42 +0000
+++ b/mysql-test/Makefile.am	2010-02-12 16:28:35 +0000
@@ -130,12 +130,12 @@ uninstall-local:
 # mtr - a shortcut for executing mysql-test-run.pl
 mtr:
 	$(RM) -f mtr
-	$(LN_S) mysql-test-run.pl mtr
+	$(LN_S) $(srcdir)/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) mysql-test-run.pl mysql-test-run
+	$(LN_S) $(srcdir)/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	2008-11-10 21:12:15 +0000
+++ b/scripts/Makefile.am	2010-02-12 16:28:35 +0000
@@ -110,7 +110,8 @@ mysqlbug: ${top_builddir}/config.status 
 mysql_fix_privilege_tables.sql: mysql_system_tables.sql \
 				mysql_system_tables_fix.sql
 	@echo "Building $@";
-	@cat mysql_system_tables.sql mysql_system_tables_fix.sql > $@
+	@cat $(srcdir)/mysql_system_tables.sql \
+	  $(srcdir)/mysql_system_tables_fix.sql > $@
 
 #
 # Build mysql_fix_privilege_tables_sql.c from
@@ -123,7 +124,7 @@ mysql_fix_privilege_tables_sql.c: comp_s
 	sleep 2
 	$(top_builddir)/scripts/comp_sql$(EXEEXT) \
 	  mysql_fix_privilege_tables \
-	    $(top_srcdir)/scripts/mysql_fix_privilege_tables.sql $@
+	    $(top_builddir)/scripts/mysql_fix_privilege_tables.sql $@
 
 
 SUFFIXES = .sh

=== modified file 'sql/share/Makefile.am'
--- a/sql/share/Makefile.am	2006-12-23 19:17:15 +0000
+++ b/sql/share/Makefile.am	2010-02-12 16:28:35 +0000
@@ -22,7 +22,7 @@ dist-hook:
 	  test -d $(distdir)/$$dir || mkdir $(distdir)/$$dir; \
 	  $(INSTALL_DATA) $(srcdir)/$$dir/*.* $(distdir)/$$dir; \
 	done; \
-	sleep 1 ; touch $(srcdir)/*/errmsg.sys
+	sleep 1 ; touch $(builddir)/*/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) $(srcdir)/$$lang/errmsg.sys \
+		$(INSTALL_DATA) $(builddir)/$$lang/errmsg.sys \
 			        $(DESTDIR)$(pkgdatadir)/$$lang/errmsg.sys; \
 	done
 	$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/charsets
-		$(INSTALL_DATA) $(srcdir)/errmsg.txt \
+		$(INSTALL_DATA) $(builddir)/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 */errmsg.sys
+	@RM@ -f $(builddir)/*/errmsg.sys
 
 # Do nothing
 link_sources:

=== modified file 'storage/ndb/src/common/util/Makefile.am'
--- a/storage/ndb/src/common/util/Makefile.am	2007-09-25 10:05:32 +0000
+++ b/storage/ndb/src/common/util/Makefile.am	2010-02-12 16:28:35 +0000
@@ -37,7 +37,7 @@ testBitmask_LDFLAGS = @ndb_bin_am_ldflag
 
 testBitmask.cpp : Bitmask.cpp
 	rm -f testBitmask.cpp
-	@LN_CP_F@ Bitmask.cpp testBitmask.cpp
+	@LN_CP_F@ $(srcdir)/Bitmask.cpp testBitmask.cpp
 
 testBitmask.o:	$(testBitmask_SOURCES)
 		$(CXXCOMPILE) -c $(INCLUDES) -D__TEST_BITMASK__ $<


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