Skip to content

M
MariaDB
Commit b5131036 authored by unknown's avatar unknown
Browse files
Options

Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M41/merge-4.1 


scripts/Makefile.am:
  Auto merged
parents 9d996ad6 dedb5b79
Hide whitespace changes
Inline Side-by-side
Showing with 1 addition and 0 deletions
scripts/Makefile.am
View file @ b5131036
...@@ -127,6 +127,7 @@ SUFFIXES = .sh ...@@ -127,6 +127,7 @@ SUFFIXES = .sh
-e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \ -e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \
-e 's!@''openssl_libs''@!@openssl_libs@!' \ -e 's!@''openssl_libs''@!@openssl_libs@!' \
-e 's!@''VERSION''@!@VERSION@!' \ -e 's!@''VERSION''@!@VERSION@!' \
-e 's!@''MYSQL_BASE_VERSION''@!@MYSQL_BASE_VERSION@!' \
-e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \ -e 's!@''MYSQL_SERVER_SUFFIX''@!@MYSQL_SERVER_SUFFIX@!' \
-e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \ -e 's!@''COMPILATION_COMMENT''@!@COMPILATION_COMMENT@!' \
-e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \ -e 's!@''MACHINE_TYPE''@!@MACHINE_TYPE@!' \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7