summaryrefslogtreecommitdiff
path: root/scripts/Makefile.am
diff options
context:
space:
mode:
authorunknown <joerg@mysql.com>2005-09-01 21:36:16 +0200
committerunknown <joerg@mysql.com>2005-09-01 21:36:16 +0200
commitb513103619bb4b7172708b364f71334570e428db (patch)
treedef7060e808bb69d2043bde823e817616e8af909 /scripts/Makefile.am
parent9d996ad6d28950f8e4ab805e264ff8ddea1124b7 (diff)
parentdedb5b793175b72fff9ade6842caf138699b06af (diff)
downloadmariadb-git-b513103619bb4b7172708b364f71334570e428db.tar.gz
Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M41/merge-4.1
scripts/Makefile.am: Auto merged
Diffstat (limited to 'scripts/Makefile.am')
-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@!' \