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 | 41e2af9fa256ff2bf65444850abc09ad5ecaafcb (patch) | |
| tree | 1adb92a14ccbe505c0035f0f41b8f01c288979b0 /extra | |
| parent | 885577b8b8a2fff45ea437dacd56b75498bfc1be (diff) | |
| parent | fc8f14262ad9ff17226cb1bd211fd48f191ec68f (diff) | |
| download | mariadb-git-41e2af9fa256ff2bf65444850abc09ad5ecaafcb.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 'extra')
| -rw-r--r-- | extra/Makefile.am | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/extra/Makefile.am b/extra/Makefile.am index 3aa4c531709..cb06e7495f9 100644 --- a/extra/Makefile.am +++ b/extra/Makefile.am @@ -14,9 +14,8 @@ # along with this program; if not, write to the Free Software # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -INCLUDES = -I$(top_srcdir)/include \ - @ndbcluster_includes@ -I$(top_srcdir)/sql \ - -I$(top_builddir)/include +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ + @ndbcluster_includes@ -I$(top_srcdir)/sql LDADD = @CLIENT_EXTRA_LDFLAGS@ ../mysys/libmysys.a \ ../dbug/libdbug.a ../strings/libmystrings.a BUILT_SOURCES= $(top_builddir)/include/mysqld_error.h \ |