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 /netware/Makefile.am | |
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 'netware/Makefile.am')
-rw-r--r-- | netware/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/netware/Makefile.am b/netware/Makefile.am index 92c8afba896..be59efd1deb 100644 --- a/netware/Makefile.am +++ b/netware/Makefile.am @@ -15,7 +15,7 @@ # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA if HAVE_NETWARE -INCLUDES = -I$(srcdir)/../include -I../include -I.. +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include -I.. LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ ../dbug/libdbug.a ../strings/libmystrings.a bin_PROGRAMS = mysqld_safe mysql_install_db mysql_test_run libmysql |