bk commit into 5.0 tree (kent:1.2321)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of kent. When kent does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2006-11-28 18:08:30+01:00, kent@stripped +1 -0
  Makefile.am:
    Handle the case "sql_yacc.cc" is pregenerated or not, and that the
    case where the source and build tree is the same or not.

  sql/Makefile.am@stripped, 2006-11-28 18:06:27+01:00, kent@stripped +5 -2
    Handle the case "sql_yacc.cc" is pregenerated or not, and that the
    case where the source and build tree is the same or not.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	kent
# Host:	kent-amd64.(none)
# Root:	/home/kent/bk/mysql-5.0-build

--- 1.127/sql/Makefile.am	2006-11-28 18:08:34 +01:00
+++ 1.128/sql/Makefile.am	2006-11-28 18:08:34 +01:00
@@ -148,12 +148,15 @@
 sql_yacc.cc:	sql_yacc.yy
 sql_yacc.h:	sql_yacc.yy
 
+# Be careful here, note that we use VPATH and might or might not have
+# a pregenerated "sql_yacc.cc" in $(srcdir) or one we just built in
+# $(builddir). And it has to work if $(srcdir) == $(builddir).
 sql_yacc.o:	sql_yacc.cc sql_yacc.h $(HEADERS)
-		@SED@ -e 's/__attribute__ ((__unused__))//' sql_yacc.cc > sql_yacc.cc-new
+		@SED@ -e 's/__attribute__ ((__unused__))//' $< > sql_yacc.cc-new
 		@MV@ sql_yacc.cc-new sql_yacc.cc
 		@echo "Note: The following compile may take a long time."
 		@echo "If it fails, re-run configure with --with-low-memory"
-		$(CXXCOMPILE) $(LM_CFLAGS) -c $<
+		$(CXXCOMPILE) $(LM_CFLAGS) -c sql_yacc.cc
 
 # This generates lex_hash.h
 # NOTE Built sources should depend on their sources not the tool