diff options
author | joerg@trift2. <> | 2007-10-19 19:22:27 +0200 |
---|---|---|
committer | joerg@trift2. <> | 2007-10-19 19:22:27 +0200 |
commit | 5e95b3c34cfe1c51bc854e961c47820c9adb8e09 (patch) | |
tree | f71dd0c6ec5c25d0e23f0d1e14b7ef6a0908600e /scripts/Makefile.am | |
parent | b3fc7aac86a7adc9f27fe2c404eafcb1fd3f43cb (diff) | |
parent | f3668c9f0371bf3f3fad5b599008ce1f815ef7fd (diff) | |
download | mariadb-git-5e95b3c34cfe1c51bc854e961c47820c9adb8e09.tar.gz |
Merge trift2.:/MySQL/M51/bug31644-5.1
into trift2.:/MySQL/M51/push-5.1
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 6143c3532d9..fc4359fd872 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@!' \ |