diff options
| author | unknown <kent@mysql.com> | 2006-04-08 04:29:17 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2006-04-08 04:29:17 +0200 |
| commit | 4c7c097241698bb30406b38de031cc8f31175d96 (patch) | |
| tree | ebd7459ca94600fef749687d8e14b4a0c015a05c /libmysqld | |
| parent | 2bb2c842bd31a2d39a4bd9ed32b7ffa3075daef2 (diff) | |
| parent | 2919dceb720303719b750ff4c72bf29a82c7bfdb (diff) | |
| download | mariadb-git-4c7c097241698bb30406b38de031cc8f31175d96.tar.gz | |
Merge mysql.com:/Users/kent/mysql/bk/mysql-5.1-release.old03
into mysql.com:/Users/kent/mysql/bk/mysql-5.1-release
libmysqld/Makefile.am:
Auto merged
mysql-test/mysql-test-run.pl:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
Diffstat (limited to 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index 961eea21d2a..6e38fb267d9 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -137,7 +137,7 @@ else $(libmysqld_a_AR) libmysqld.a libmysqld_int.a $(INC_LIB) ; \ else \ (for arc in ./libmysqld_int.a $(INC_LIB); do \ - arpath=`echo $$arc|sed 's|[^/]*$$||'`; \ + arpath=`echo $$arc|sed 's|[^/]*$$||'|sed 's|\.libs/$$||'`; \ $(AR) t $$arc|xargs -n 1 find $$arpath -name; \ $(AR) t $$arc|xargs -n 1 find `dirname $$arpath` -path \*/`basename $$arpath`/\* -name; \ done; echo $(libmysqld_a_DEPENDENCIES) ) | sort -u | xargs $(AR) cq libmysqld.a ; \ |