diff options
| author | Igor Babaev <igor@askmonty.org> | 2010-03-31 16:10:03 -0700 |
|---|---|---|
| committer | Igor Babaev <igor@askmonty.org> | 2010-03-31 16:10:03 -0700 |
| commit | 48014285f18f912e0ed9dceab4bf96ea469557da (patch) | |
| tree | d84f663cfc691bcab5da8073a8566f7d1c8b7bb5 /mysys | |
| parent | 0513c2461ce6d341ef744cd5621648bc67f749e6 (diff) | |
| parent | fee40e27738122d5c7d7916a1cfa8cd2b5a20186 (diff) | |
| download | mariadb-git-48014285f18f912e0ed9dceab4bf96ea469557da.tar.gz | |
Merge with the latest changes og 5.2.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/Makefile.am | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mysys/Makefile.am b/mysys/Makefile.am index 5137566c158..337fc86c12e 100644 --- a/mysys/Makefile.am +++ b/mysys/Makefile.am @@ -74,13 +74,13 @@ libmysys_a_LIBADD = @THREAD_LOBJECTS@ # testhash_DEPENDENCIES= $(LIBRARIES) # test_charset_DEPENDENCIES= $(LIBRARIES) # charset2html_DEPENDENCIES= $(LIBRARIES) -DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \ - -DMYSQL_DATADIR="\"$(MYSQLDATAdir)\"" \ - -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ - -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ +DEFS = -DDEFAULT_BASEDIR='"$(prefix)"' \ + -DMYSQL_DATADIR='"$(MYSQLDATAdir)"' \ + -DDEFAULT_CHARSET_HOME='"$(MYSQLBASEdir)"' \ + -DSHAREDIR'="$(MYSQLSHAREdir)"' \ -DDEFAULT_HOME_ENV=MYSQL_HOME \ -DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \ - -DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \ + -DDEFAULT_SYSCONFDIR='"$(sysconfdir)"' \ @DEFS@ libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@ |