bk commit into 5.0 tree (mtaylor:1.2459)

[Monty Taylor]

Below is the list of changes that have just been committed into a local
5.0 repository of mtaylor. When mtaylor 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, 2007-04-16 21:04:58-07:00, mtaylor@qualinost.(none) +1 -0
  Fixed two problems with the build caused by adding debian to the source tree

  debian/rules@stripped, 2007-04-16 21:04:55-07:00, mtaylor@qualinost.(none) +2 -2
    The variable substitution was stepping on the Makefile from automake. 

  debian/rules@stripped, 2007-04-13 16:27:25-07:00, mtaylor@qualinost.(none) +1 -1
    Needed a space between ifneq and (

# 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:	mtaylor
# Host:	qualinost.(none)
# Root:	/home/mtaylor/src/mysql/mysql-5.0-maint-debian

--- 1.3/debian/rules	2007-04-16 21:05:04 -07:00
+++ 1.5/debian/rules	2007-04-16 21:05:04 -07:00
@@ -71,7 +71,7 @@
     USE_STATIC_MYSQLD=--with-mysqld-ldflags=-all-static
 endif
 
-ifneq($(MYSQL_BUILD_TEST),yes)
+ifneq ("$(MYSQL_BUILD_TEST)","yes")
     MYSQL_BUILD_TEST=no
 endif
 
@@ -194,7 +194,7 @@
                                 s,MYOLDVER,$(MYOLDVER),g;\
                                 s,NDBSOVER,$(NDBSOVER),g;\
                                 s,MYSOVER,$(MYSOVER),g;s,\.in$$,,"`; \
-            if [ $$f2 != debian/control ]; then \
+            if [ $$f2 != debian/control -a $$f2 != Makefile ]; then \
                 sed -e "s/@MYVER@/$(MYVER)/g" \
 		    -e "s/@VERSIONSTRING@/$(VERSIONSTRING)/g" \
 		    -e "s/@VER@/$(VER)/g" \
@@ -233,7 +233,7 @@
                                 s,MYSRCVER,$(MYSRCVER),g;\
                                 s,NDBSOVER,$(NDBSOVER),g;\
                                 s,MYSOVER,$(MYSOVER),g;s,\.in$$,,"`; \
-            if [ $$f2 != debian/control ]; then \
+            if [ $$f2 != debian/control -a $$f2 != Makefile ]; then \
 		rm -f $$f2; \
             fi; \
         done