diff options
| author | unknown <joerg@trift2.> | 2007-10-19 19:06:30 +0200 |
|---|---|---|
| committer | unknown <joerg@trift2.> | 2007-10-19 19:06:30 +0200 |
| commit | 6f5da0a989e15dd5df74f6bbbd6bb4ef2de6b9c9 (patch) | |
| tree | 463dda7795499952d3c6a6549c053a021f378d78 /scripts/Makefile.am | |
| parent | feb165c855c60e63824814736ecf1be1d157cc49 (diff) | |
| parent | a9624698be3d1aca47454fb9a5060c637e6b1d66 (diff) | |
| download | mariadb-git-6f5da0a989e15dd5df74f6bbbd6bb4ef2de6b9c9.tar.gz | |
Merge trift2.:/MySQL/M50/bug31644-5.0
into trift2.:/MySQL/M51/bug31644-5.1
configure.in:
Auto merged
scripts/Makefile.am:
Auto merged
scripts/mysqlbug.sh:
Auto merged
Diffstat (limited to 'scripts/Makefile.am')
| -rw-r--r-- | scripts/Makefile.am | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am index fed96490397..da4c48ac9b6 100644 --- a/scripts/Makefile.am +++ b/scripts/Makefile.am @@ -144,13 +144,19 @@ SUFFIXES = .sh -e 's!@''CC''@!@CC@!'\ -e 's!@''CXX''@!@CXX@!'\ -e 's!@''GXX''@!@GXX@!'\ + -e 's!@''SAVE_CC''@!@SAVE_CC@!'\ + -e 's!@''SAVE_CXX''@!@SAVE_CXX@!'\ -e 's!@''CC_VERSION''@!@CC_VERSION@!'\ -e 's!@''CXX_VERSION''@!@CXX_VERSION@!'\ -e 's!@''PERL''@!@PERL@!' \ - -e 's!@''ASFLAGS''@!@SAVE_ASFLAGS@!'\ - -e 's!@''CFLAGS''@!@SAVE_CFLAGS@!'\ - -e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\ - -e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\ + -e 's!@''SAVE_ASFLAGS''@!@SAVE_ASFLAGS@!'\ + -e 's!@''SAVE_CFLAGS''@!@SAVE_CFLAGS@!'\ + -e 's!@''SAVE_CXXFLAGS''@!@SAVE_CXXFLAGS@!'\ + -e 's!@''SAVE_LDFLAGS''@!@SAVE_LDFLAGS@!'\ + -e 's!@''ASFLAGS''@!@ASFLAGS@!'\ + -e 's!@''CFLAGS''@!@CFLAGS@!'\ + -e 's!@''CXXFLAGS''@!@CXXFLAGS@!'\ + -e 's!@''LDFLAGS''@!@LDFLAGS@!'\ -e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \ -e 's!@''ZLIB_LIBS''@!@ZLIB_LIBS@!' \ -e 's!@''LIBS''@!@LIBS@!' \ |