diff options
| author | igor@rurik.mysql.com <> | 2006-05-31 18:10:02 -0700 |
|---|---|---|
| committer | igor@rurik.mysql.com <> | 2006-05-31 18:10:02 -0700 |
| commit | 0585e505995101f479c921db79625b326f631211 (patch) | |
| tree | a7218b6f6c71fcca4def61742512d2f7ab662bf8 /scripts | |
| parent | 5d8d38ee4c0bb7232fffd1a9dfac08d70788d409 (diff) | |
| parent | 1504abcdd5b86eecd2a8eef54b5439a94e3b845e (diff) | |
| download | mariadb-git-0585e505995101f479c921db79625b326f631211.tar.gz | |
Merge rurik.mysql.com:/home/igor/tmp_merge
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/make_sharedlib_distribution.sh | 6 | ||||
| -rw-r--r-- | scripts/make_win_src_distribution.sh | 1 |
2 files changed, 5 insertions, 2 deletions
diff --git a/scripts/make_sharedlib_distribution.sh b/scripts/make_sharedlib_distribution.sh index fbc945e445a..c475d0e14a4 100644 --- a/scripts/make_sharedlib_distribution.sh +++ b/scripts/make_sharedlib_distribution.sh @@ -45,9 +45,11 @@ fi 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 ] diff --git a/scripts/make_win_src_distribution.sh b/scripts/make_win_src_distribution.sh index 53f05c131ac..bb1243aa998 100644 --- a/scripts/make_win_src_distribution.sh +++ b/scripts/make_win_src_distribution.sh @@ -345,6 +345,7 @@ mv $BASE/sql/sql_yacc.cpp-new $BASE/sql/sql_yacc.cpp find $BASE \( -name "*.cnf" -o -name "*.ini" \ -o -name COPYING -o -name ChangeLog -o -name EXCEPTIONS-CLIENT \ -o -name "INSTALL*" -o -name LICENSE -o -name "README*" \ + -o -name "*.dsp" -o -name "*.dsw" \ -o -name "*.vcproj" -o -name "*.sln" \) -type f -print \ | while read v do |