bk commit into 4.0 tree (kent:1.2183)

[kent]

Below is the list of changes that have just been committed into a local
4.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
  1.2183 06/06/26 23:44:17 kent@stripped +2 -0
  make_sharedlib_distribution.sh:
    For compatibility, don't use {..,..} in pattern matching
  make_binary_distribution.sh:
    Added .dylib and .sl as shared library extensions

  scripts/make_sharedlib_distribution.sh
    1.3 06/06/26 23:43:50 kent@stripped +4 -2
    For compatibility, don't use {..,..} in pattern matching

  scripts/make_binary_distribution.sh
    1.63 06/06/26 23:42:36 kent@stripped +14 -4
    Added .dylib and .sl as shared library extensions

# 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:	c-6a4072d5.010-2112-6f72651.cust.bredbandsbolaget.se
# Root:	/Users/kent/mysql/bk/mysql-4.0

--- 1.62/scripts/make_binary_distribution.sh	2006-02-12 01:33:13 +01:00
+++ 1.63/scripts/make_binary_distribution.sh	2006-06-26 23:42:36 +02:00
@@ -154,11 +154,21 @@
 fi
 
 for i in \
-  libmysql/.libs/libmysqlclient.a libmysql/.libs/libmysqlclient.so* \
-  libmysql/libmysqlclient.* libmysql_r/.libs/libmysqlclient_r.a \
-  libmysql_r/.libs/libmysqlclient_r.so* libmysql_r/libmysqlclient_r.* \
+  libmysql/.libs/libmysqlclient.a \
+  libmysql/.libs/libmysqlclient.so* \
+  libmysql/.libs/libmysqlclient.sl* \
+  libmysql/.libs/libmysqlclient*.dylib \
+  libmysql/libmysqlclient.* \
+  libmysql_r/.libs/libmysqlclient_r.a \
+  libmysql_r/.libs/libmysqlclient_r.so* \
+  libmysql_r/.libs/libmysqlclient_r.sl* \
+  libmysql_r/.libs/libmysqlclient_r*.dylib \
+  libmysql_r/libmysqlclient_r.* \
+  libmysqld/.libs/libmysqld.a \
+  libmysqld/.libs/libmysqld.so* \
+  libmysqld/.libs/libmysqld.sl* \
+  libmysqld/.libs/libmysqld*.dylib \
   mysys/libmysys.a strings/libmystrings.a dbug/libdbug.a \
-  libmysqld/.libs/libmysqld.a libmysqld/.libs/libmysqld.so* \
   libmysqld/libmysqld.a netware/libmysql.imp
 do
   if [ -f $i ]

--- 1.2/scripts/make_sharedlib_distribution.sh	2004-07-23 12:44:06 +02:00
+++ 1.3/scripts/make_sharedlib_distribution.sh	2006-06-26 23:43:50 +02:00
@@ -45,9 +45,11 @@
 mkdir -p $BASE/lib
 
 for i in \
-  libmysql/.libs/libmysqlclient.s{l,o}* \
+  libmysql/.libs/libmysqlclient.so* \
+  libmysql/.libs/libmysqlclient.sl* \
   libmysql/.libs/libmysqlclient*.dylib \
-  libmysql_r/.libs/libmysqlclient_r.s{l,o}* \
+  libmysql_r/.libs/libmysqlclient_r.so* \
+  libmysql_r/.libs/libmysqlclient_r.sl* \
   libmysql_r/.libs/libmysqlclient_r*.dylib
 do
   if [ -f $i ]