diff options
| author | unknown <jani@hundin.mysql.fi> | 2006-05-01 21:53:35 +0300 |
|---|---|---|
| committer | unknown <jani@hundin.mysql.fi> | 2006-05-01 21:53:35 +0300 |
| commit | 29a3343e6bb419110d936d18cf929430bd329682 (patch) | |
| tree | 2949bfdfc685629b7aca1cc17b5f9f6822ce5ffe | |
| parent | 8cd0f370bfc37f380b69155659344ef94efa95f6 (diff) | |
| parent | 38b1f7c7c3790a6ee59dd213eab16fe9c6fd97f4 (diff) | |
| download | mariadb-git-29a3343e6bb419110d936d18cf929430bd329682.tar.gz | |
Merge jamppa@bk-internal.mysql.com:/home/bk/mysql-4.1
into hundin.mysql.fi:/home/jani/mysql-4.1
| -rw-r--r-- | support-files/mysql.spec.sh | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/support-files/mysql.spec.sh b/support-files/mysql.spec.sh index ab2319fa2bb..efe42a035e6 100644 --- a/support-files/mysql.spec.sh +++ b/support-files/mysql.spec.sh @@ -318,16 +318,11 @@ fi make -i test-force || true # Save mysqld-max -# check if mysqld was installed in .libs/ -if test -f sql/.libs/mysqld -then - cp sql/.libs/mysqld sql/mysqld-max -else - cp sql/mysqld sql/mysqld-max -fi -nm --numeric-sort sql/mysqld-max > sql/mysqld-max.sym +./libtool --mode=execute cp sql/mysqld sql/mysqld-max +./libtool --mode=execute nm --numeric-sort sql/mysqld-max > sql/mysqld-max.sym + # Save the perror binary so it supports the NDB error codes (BUG#13740) -mv extra/perror extra/perror.ndb +./libtool --mode=execute cp extra/perror extra/perror.ndb # Install the ndb binaries (cd ndb; make install DESTDIR=$RBR) @@ -373,12 +368,8 @@ BuildMySQL "--disable-shared \ --with-innodb \ --without-vio \ --without-openssl" -if test -f sql/.libs/mysqld -then - nm --numeric-sort sql/.libs/mysqld > sql/mysqld.sym -else - nm --numeric-sort sql/mysqld > sql/mysqld.sym -fi + +./libtool --mode=execute nm --numeric-sort sql/mysqld > sql/mysqld.sym # We might want to save the config log file if test -n "$MYSQL_CONFLOG_DEST" @@ -717,6 +708,11 @@ fi # itself - note that they must be ordered by date (important when # merging BK trees) %changelog +* Mon May 01 2006 Kent Boortz <kent@mysql.com> + +- Use "./libtool --mode=execute" instead of searching for the + executable in current directory and ".libs". + * Sat Apr 01 2006 Kent Boortz <kent@mysql.com> - Set $LDFLAGS from $MYSQL_BUILD_LDFLAGS |