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 /libmysqld | |
| 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 'libmysqld')
| -rw-r--r-- | libmysqld/Makefile.am | 4 | ||||
| -rw-r--r-- | libmysqld/examples/Makefile.am | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libmysqld/Makefile.am b/libmysqld/Makefile.am index ba63d213b88..9aef03f20d2 100644 --- a/libmysqld/Makefile.am +++ b/libmysqld/Makefile.am @@ -25,10 +25,10 @@ DEFS = -DEMBEDDED_LIBRARY -DMYSQL_SERVER \ -DDEFAULT_MYSQL_HOME="\"$(MYSQLBASEdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" -INCLUDES= @bdb_includes@ -I$(top_srcdir)/include \ +INCLUDES= @bdb_includes@ \ + -I$(top_builddir)/include -I$(top_srcdir)/include \ -I$(top_srcdir)/sql -I$(top_srcdir)/sql/examples \ -I$(top_srcdir)/regex \ - -I$(top_builddir)/include \ $(openssl_includes) @ZLIB_INCLUDES@ noinst_LIBRARIES = libmysqld_int.a diff --git a/libmysqld/examples/Makefile.am b/libmysqld/examples/Makefile.am index 071a133ca2d..476f297fe0d 100644 --- a/libmysqld/examples/Makefile.am +++ b/libmysqld/examples/Makefile.am @@ -31,9 +31,9 @@ link_sources: done; DEFS = -DEMBEDDED_LIBRARY -INCLUDES = -I$(top_srcdir)/include -I$(srcdir) \ +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I$(srcdir) \ -I$(top_srcdir) -I$(top_srcdir)/client -I$(top_srcdir)/regex \ - -I$(top_builddir)/include $(openssl_includes) + $(openssl_includes) LIBS = @LIBS@ @WRAPLIBS@ @CLIENT_LIBS@ LDADD = @CLIENT_EXTRA_LDFLAGS@ ../libmysqld.a @innodb_system_libs@ @LIBDL@ $(CXXLDFLAGS) |