diff options
author | unknown <msvensson@shellback.(none)> | 2006-04-10 15:13:11 +0200 |
---|---|---|
committer | unknown <msvensson@shellback.(none)> | 2006-04-10 15:13:11 +0200 |
commit | 7672a2264a67b419e702862edd5ec5dae6afe6a2 (patch) | |
tree | bdbd74fadc4af2be717e5990a7da7019c278a22a /libmysql | |
parent | b6c8c68ebea6f27fe1ca1499052533dcaee59887 (diff) | |
parent | f2ff24bd62f8b588f5966e115c1ec26c64e0a913 (diff) | |
download | mariadb-git-7672a2264a67b419e702862edd5ec5dae6afe6a2.tar.gz |
Merge shellback.(none):/home/msvensson/mysql/bug15069/my50-bug15069
into shellback.(none):/home/msvensson/mysql/bug15069/my51-bug15069
mysys/Makefile.am:
Auto merged
mysys/default.c:
Auto merged
Diffstat (limited to 'libmysql')
-rw-r--r-- | libmysql/Makefile.shared | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libmysql/Makefile.shared b/libmysql/Makefile.shared index c4c9c0036e2..fd0a4eb051d 100644 --- a/libmysql/Makefile.shared +++ b/libmysql/Makefile.shared @@ -85,6 +85,7 @@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -DDEFAULT_HOME_ENV=MYSQL_HOME \ -DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \ + -DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs) # The automatic dependencies miss this |