summaryrefslogtreecommitdiff
path: root/support-files
diff options
context:
space:
mode:
authorunknown <joerg@mysql.com>2005-04-26 19:26:51 +0200
committerunknown <joerg@mysql.com>2005-04-26 19:26:51 +0200
commit3b2964c5c460fc81ea21aeb59303cd8beae73e1a (patch)
tree9db2bd2cfc64e175a0b5465c1ca47198f6086b4d /support-files
parent1faa742b86727245ad07e150be19670033adeee7 (diff)
parent98b911d53770d7a6b6b9df67f7a049d189a4aec1 (diff)
downloadmariadb-git-3b2964c5c460fc81ea21aeb59303cd8beae73e1a.tar.gz
Merge jbruehe@bk-internal.mysql.com:/home/bk/mysql-4.1
into mysql.com:/M41/mysql-4.1 acinclude.m4: Auto merged configure.in: Auto merged
Diffstat (limited to 'support-files')
-rw-r--r--support-files/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/support-files/Makefile.am b/support-files/Makefile.am
index 0a6077f0efc..5f5a10fc1fc 100644
--- a/support-files/Makefile.am
+++ b/support-files/Makefile.am
@@ -90,7 +90,7 @@ SUFFIXES = .sh
-e 's!@''FIND_PROC''@!@FIND_PROC@!' \
-e 's!@''MYSQLD_DEFAULT_SWITCHES''@!@MYSQLD_DEFAULT_SWITCHES@!' \
-e 's!@''MYSQL_UNIX_ADDR''@!@MYSQL_UNIX_ADDR@!' \
- -e 's!@''IS_LINUX''@!@IS_LINUX@!' \
+ -e 's!@''TARGET_LINUX''@!@TARGET_LINUX@!' \
-e "s!@""CONF_COMMAND""@!@CONF_COMMAND@!" \
-e 's!@''MYSQLD_USER''@!@MYSQLD_USER@!' \
-e 's!@''sysconfdir''@!@sysconfdir@!' \