summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorjoerg@mysql.com <>2005-09-01 21:36:16 +0200
committerjoerg@mysql.com <>2005-09-01 21:36:16 +0200
commit163ead846e98b8973670a4003c7ea07f32b93976 (patch)
treedef7060e808bb69d2043bde823e817616e8af909 /scripts
parent54e797a27d3e722d9368c6e7b19f0c3027793a61 (diff)
parent0a2e013c9d9c2aebbdadbd88d2b37cf54dd93c80 (diff)
downloadmariadb-git-163ead846e98b8973670a4003c7ea07f32b93976.tar.gz
Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M41/merge-4.1
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index dd8f4fb505b..27b42314273 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -127,6 +127,7 @@ SUFFIXES = .sh
-e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \
-e 's!@''openssl_libs''@!@openssl_libs@!' \
-e 's!@''VERSION''@!@VERSION@!' \
+ -e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \
-e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
-e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
-e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \