summaryrefslogtreecommitdiff
path: root/regex
diff options
context:
space:
mode:
authorunknown <kent@mysql.com>2005-07-06 00:06:11 +0200
committerunknown <kent@mysql.com>2005-07-06 00:06:11 +0200
commit41e2af9fa256ff2bf65444850abc09ad5ecaafcb (patch)
tree1adb92a14ccbe505c0035f0f41b8f01c288979b0 /regex
parent885577b8b8a2fff45ea437dacd56b75498bfc1be (diff)
parentfc8f14262ad9ff17226cb1bd211fd48f191ec68f (diff)
downloadmariadb-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 'regex')
-rw-r--r--regex/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/regex/Makefile.am b/regex/Makefile.am
index 07d7a03635d..3b161287d36 100644
--- a/regex/Makefile.am
+++ b/regex/Makefile.am
@@ -15,7 +15,7 @@
# 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
noinst_LIBRARIES = libregex.a
LDADD= libregex.a $(top_builddir)/strings/libmystrings.a
noinst_HEADERS = cclass.h cname.h regex2.h utils.h engine.c regex.h