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 /heap | |
| 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 'heap')
| -rw-r--r-- | heap/Makefile.am | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/heap/Makefile.am b/heap/Makefile.am index 2262fa3d5b1..567c7774751 100644 --- a/heap/Makefile.am +++ b/heap/Makefile.am @@ -14,7 +14,7 @@ # 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 +INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include LDADD = libheap.a ../mysys/libmysys.a ../dbug/libdbug.a \ ../strings/libmystrings.a pkglib_LIBRARIES = libheap.a |