diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-10-19 12:09:52 +0200 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-10-19 12:09:52 +0200 |
| commit | 49c446059c2de4be66dc7a09d1618995aee742e3 (patch) | |
| tree | 11acbcf83ba9f40be4d590a80de9558743535f17 /scripts/Makefile.am | |
| parent | 8cf025ec3fc27f912df7390e57e93d1f06aa3daa (diff) | |
| parent | 813d8ff6dc298ec18c251c3d0e59ba9823331f1a (diff) | |
| download | mariadb-git-49c446059c2de4be66dc7a09d1618995aee742e3.tar.gz | |
Manual merge mysql-trunk -> mysql-trunk-wl3352
Diffstat (limited to 'scripts/Makefile.am')
| -rw-r--r-- | scripts/Makefile.am | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index e493c68827c..cd758370388 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -169,7 +169,6 @@ SUFFIXES = .sh -e 's!@''ZLIB_LIBS''@!@ZLIB_LIBS@!' \ -e 's!@''LIBS''@!@LIBS@!' \ -e 's!@''WRAPLIBS''@!@WRAPLIBS@!' \ - -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@!' \ |