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 /regex | |
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 'regex')
-rw-r--r-- | regex/Makefile.am | 2 |
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 |