diff options
| author | unknown <kent@mysql.com> | 2005-07-06 00:06:11 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-07-06 00:06:11 +0200 |
| commit | ad0516d91e5b41286bbadc716a350b244ad8337e (patch) | |
| tree | 1adb92a14ccbe505c0035f0f41b8f01c288979b0 /sql | |
| parent | 711464a11de68abe5835a74a41f7c347a1e93b67 (diff) | |
| parent | b0a6a8e13780182a172b2c0a5b6ef008b6d0645f (diff) | |
| download | mariadb-git-ad0516d91e5b41286bbadc716a350b244ad8337e.tar.gz | |
Merge
BitKeeper/deleted/.del-Makefile.am~6cfa0db5e7778d09:
Auto merged
BitKeeper/deleted/.del-Makefile.am~41238af048e60515:
Auto merged
mysql-test/Makefile.am:
Auto merged
netware/Makefile.am:
Auto merged
tests/Makefile.am:
Auto merged
vio/Makefile.am:
SCCS merged
Diffstat (limited to 'sql')
| -rw-r--r-- | sql/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/Makefile.am b/sql/Makefile.am index 524ec93a6a9..4491b8a2e31 100644 --- a/sql/Makefile.am +++ b/sql/Makefile.am @@ -21,8 +21,8 @@ MYSQLSHAREdir = $(pkgdatadir) MYSQLBASEdir= $(prefix) INCLUDES = @ZLIB_INCLUDES@ \ @bdb_includes@ @innodb_includes@ @ndbcluster_includes@ \ - -I$(top_srcdir)/include -I$(top_srcdir)/regex \ - -I$(srcdir) $(openssl_includes) -I$(top_builddir)/include + -I$(top_builddir)/include -I$(top_srcdir)/include \ + -I$(srcdir) $(openssl_includes) WRAPLIBS= @WRAPLIBS@ SUBDIRS = share libexec_PROGRAMS = mysqld |