bk commit into 5.0 tree (kent:1.2108)

[kent]

Below is the list of changes that have just been committed into a local
5.0 repository of mysqldev. When mysqldev 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
  1.2108 06/06/16 19:24:38 kent@stripped +2 -0
  configure.in:
    Corrected make file modifications, "comp_err" call is moved
    to "extra/Makefile.in" (for Netware build)
  compile-netware-END:
    Move modification of make files for Netware to one place,
    it is already done in "configure.in"

  configure.in
    1.387 06/06/16 19:21:47 kent@stripped +3 -3
    Corrected make file modifications, "comp_err" call is moved
    to "extra/Makefile.in"

  netware/BUILD/compile-netware-END
    1.8 06/06/16 19:20:53 kent@stripped +0 -5
    Move modification of make files to one place,
    it is already done in "configure.in"

# 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:	suse9-x86.mysql.com
# Root:	/data0/mydev/mysql-5.0.22-build

--- 1.386/configure.in	2006-05-24 14:20:22 +02:00
+++ 1.387/configure.in	2006-06-16 19:21:47 +02:00
@@ -1130,7 +1130,7 @@
     # Edit Makefile.in files.
     #
     echo -n "configuring Makefile.in files for NetWare... "
-    for file in sql/Makefile.in libmysql/Makefile.in libmysql_r/Makefile.in
sql/share/Makefile.in strings/Makefile.in client/Makefile.in
+    for file in sql/Makefile.in libmysql/Makefile.in libmysql_r/Makefile.in
extra/Makefile.in strings/Makefile.in client/Makefile.in
     do
     # echo "#### $file ####"
       filedir="`dirname $file`"
@@ -1156,9 +1156,9 @@
 s%\(mysqld_DEPENDENCIES = \) %\1$lib_DEPENDENCIES %
 EOF
           ;;
-        sql/share/Makefile.in)
+        extra/Makefile.in)
           cat > $filesed << EOF
-s,\(extra/comp_err\),\1.linux,
+s,\(extra/comp_err\)\$(EXEEXT),\1.linux,
 EOF
           ;;
         libmysql/Makefile.in)

--- 1.7/netware/BUILD/compile-netware-END	2005-10-28 10:48:09 +02:00
+++ 1.8/netware/BUILD/compile-netware-END	2006-06-16 19:20:53 +02:00
@@ -21,11 +21,6 @@
 # run auto tools
 . $path/compile-AUTOTOOLS
 
-# For NetWare there is no comp_err but comp_err.linux
-sed -e "s/comp_err/comp_err.linux/g" extra/Makefile.am > extra/Makefile.am.$$
-sed -e "s/replace comp_err.linux/replace comp_err/g" extra/Makefile.am.$$ >
extra/Makefile.am
-rm extra/Makefile.am.$$
-
 # configure
 ./configure $base_configs $extra_configs