summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorjoreland@mysql.com <>2005-01-12 11:24:46 +0100
committerjoreland@mysql.com <>2005-01-12 11:24:46 +0100
commit953df8f48d960829004c55d21c21e4bfcfc1d1ff (patch)
tree1f0b9b0d34e656749bbdb72b8f4306485974c23d /scripts
parent4860bf9a06f597c420c4b285a178775ea7deefd4 (diff)
parenteeabd0bb67142c679de376bff13b7fce09960977 (diff)
downloadmariadb-git-953df8f48d960829004c55d21c21e4bfcfc1d1ff.tar.gz
Merge mysql.com:/home/jonas/src/mysql-4.1
into mysql.com:/home/jonas/src/mysql-5.0
Diffstat (limited to 'scripts')
-rw-r--r--scripts/Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 4158b5a34dc..71b70fc0e4a 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -121,6 +121,7 @@ SUFFIXES = .sh
-e 's!@''CXXFLAGS''@!@SAVE_CXXFLAGS@!'\
-e 's!@''LDFLAGS''@!@SAVE_LDFLAGS@!'\
-e 's!@''CLIENT_LIBS''@!@CLIENT_LIBS@!' \
+ -e 's!@''ZLIB_LIBS''@!@ZLIB_LIBS@!' \
-e 's!@''LIBS''@!@LIBS@!' \
-e 's!@''WRAPLIBS''@!@WRAPLIBS@!' \
-e 's!@''innodb_system_libs''@!@innodb_system_libs@!' \