summaryrefslogtreecommitdiff
path: root/scripts/Makefile.am
diff options
context:
space:
mode:
authorunknown <df@kahlann.erinye.com>2006-12-07 15:13:12 +0100
committerunknown <df@kahlann.erinye.com>2006-12-07 15:13:12 +0100
commit596fe3a58eb2616109c679bea7a703274858d7fd (patch)
treea8e36a65cad51a2bef23b7f9a5471b597f37f7ba /scripts/Makefile.am
parent23d7e99f9f5aec48903a9ff83f7c3463aa89f734 (diff)
parent90d747610ce73d27c71d9dbda22c1edc950219b0 (diff)
downloadmariadb-git-596fe3a58eb2616109c679bea7a703274858d7fd.tar.gz
Merge kahlann.erinye.com:/home/df/mysql/build/mysql-4.1-build-work
into kahlann.erinye.com:/home/df/mysql/build/mysql-5.0-build-work scripts/Makefile.am: Auto merged scripts/mysqld_multi.sh: Auto merged
Diffstat (limited to 'scripts/Makefile.am')
-rw-r--r--scripts/Makefile.am1
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index dd4c133ff94..5f49620c975 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -115,6 +115,7 @@ SUFFIXES = .sh
-e 's!@''pkglibdir''@!$(pkglibdir)!g' \
-e 's!@''pkgincludedir''@!$(pkgincludedir)!g' \
-e 's!@''pkgdatadir''@!$(pkgdatadir)!g' \
+ -e 's!@''sysconfdir''@!$(sysconfdir)!g' \
-e 's!@''CC''@!@CC@!'\
-e 's!@''CXX''@!@CXX@!'\
-e 's!@''GXX''@!@GXX@!'\