summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorkent@mysql.com/kent-amd64.(none) <>2008-02-26 18:36:06 +0100
committerkent@mysql.com/kent-amd64.(none) <>2008-02-26 18:36:06 +0100
commitac15eee942b492764690b634570ca32bda446b6c (patch)
tree6b688301bdebe315cb40a33ec74716a7786b1a80 /support-files
parent3426a62a9fdf0e012a6133dade542252130db0a2 (diff)
downloadmariadb-git-ac15eee942b492764690b634570ca32bda446b6c.tar.gz
Makefile.am, Info.plist.sh:
Use MYSQL_NUMERIC_VERSION, only three numbers separated with dot misc.m4, character_sets.m4, openssl.m4: Removed unneded semicolon
Diffstat (limited to 'support-files')
-rw-r--r--support-files/MacOSX/Info.plist.sh2
-rw-r--r--support-files/MacOSX/Makefile.am2
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