diff options
| author | unknown <kent@kent-amd64.(none)> | 2008-02-26 18:38:43 +0100 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2008-02-26 18:38:43 +0100 |
| commit | 1113518436ab205e505c8af233d401a393a5cda6 (patch) | |
| tree | 059522210811c81c0dbbed66a9bd680518ffa317 /support-files/MacOSX | |
| parent | 977edd0c8424dd2ee3ab743ef5b6ef16b770bb49 (diff) | |
| parent | 1aaa63aabaef8015c71fc6143b3062e197049707 (diff) | |
| download | mariadb-git-1113518436ab205e505c8af233d401a393a5cda6.tar.gz | |
Merge mysql.com:/home/kent/bk/build/mysql-5.0-build
into mysql.com:/home/kent/bk/build/mysql-5.1-build
config/ac-macros/misc.m4:
Auto merged
configure.in:
Auto merged
BitKeeper/deleted/.del-openssl.m4~41cebd0ba8281769:
Auto merged
storage/ndb/src/common/util/SocketServer.cpp:
Auto merged
Diffstat (limited to 'support-files/MacOSX')
| -rw-r--r-- | support-files/MacOSX/Info.plist.sh | 2 | ||||
| -rw-r--r-- | support-files/MacOSX/Makefile.am | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/support-files/MacOSX/Info.plist.sh b/support-files/MacOSX/Info.plist.sh index fdfb0c7a17c..7df9c5ac710 100644 --- a/support-files/MacOSX/Info.plist.sh +++ b/support-files/MacOSX/Info.plist.sh @@ -9,7 +9,7 @@ <key>CFBundleName</key> <string>MySQL</string> <key>CFBundleShortVersionString</key> - <string>@MYSQL_NO_DASH_VERSION@</string> + <string>@MYSQL_NUMERIC_VERSION@</string> <key>IFPkgFlagAllowBackRev</key> <false/> <key>IFPkgFlagAuthorizationAction</key> diff --git a/support-files/MacOSX/Makefile.am b/support-files/MacOSX/Makefile.am index 85ccb9c126d..3f11107d714 100644 --- a/support-files/MacOSX/Makefile.am +++ b/support-files/MacOSX/Makefile.am @@ -47,7 +47,7 @@ SUFFIXES = .sh @SED@ \ -e 's!@''prefix''@!$(prefix)!g' \ -e 's!@''VERSION''@!@VERSION@!' \ - -e 's!@''MYSQL_NO_DASH_VERSION''@!@MYSQL_NO_DASH_VERSION@!' \ + -e 's!@''MYSQL_NUMERIC_VERSION''@!@MYSQL_NUMERIC_VERSION@!' \ -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \ -e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \ $< > $@-t |