Merge mysql.com:/M40/raymond-4.0 into mysql.com:/M51/merge-5.1
scripts/Makefile.am: Auto merged
This commit is contained in:
commit
22089ea6bb
@ -125,6 +125,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@!' \
|
||||
|
Loading…
x
Reference in New Issue
Block a user