diff options
| author | unknown <joerg@mysql.com> | 2005-09-01 21:54:18 +0200 |
|---|---|---|
| committer | unknown <joerg@mysql.com> | 2005-09-01 21:54:18 +0200 |
| commit | 1a7bb6f5a97fba2f895ae22da86d468e6588b8c4 (patch) | |
| tree | eccbc49c9e7d392dc5466ee2a7d534b00ddf3a4c /scripts | |
| parent | a29b21a2c7d6eebb8b04255095c64b6a9ea19bc6 (diff) | |
| parent | dedb5b793175b72fff9ade6842caf138699b06af (diff) | |
| download | mariadb-git-1a7bb6f5a97fba2f895ae22da86d468e6588b8c4.tar.gz | |
Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M50/merge-5.0
scripts/Makefile.am:
Auto merged
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index 474ebedda62..2f6dd8c52e5 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@!' \ |