diff options
author | unknown <msvensson@neptunus.(none)> | 2006-04-10 15:14:47 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-04-10 15:14:47 +0200 |
commit | e1a7ab5cc171eabfcdfe18bae4717c59586505fc (patch) | |
tree | 8af025f268fb99e269f0f59e6e134830dc72105a /libmysql | |
parent | 39cc2ef8c476fe98699d766ed112d2a2bc38f2f6 (diff) | |
parent | 04bc54920960c4e2d7587cd3e74cb645d64476ec (diff) | |
download | mariadb-git-e1a7ab5cc171eabfcdfe18bae4717c59586505fc.tar.gz |
Merge 192.168.0.20:mysql/bug15069/my51-bug15069
into neptunus.(none):/home/msvensson/mysql/mysql-5.1
libmysql/Makefile.shared:
Auto merged
mysys/Makefile.am:
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 a641bdf2f10..c2d98a81042 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) if HAVE_YASSL |