diff options
| author | unknown <kent@kent-amd64.(none)> | 2007-07-30 21:45:06 +0200 |
|---|---|---|
| committer | unknown <kent@kent-amd64.(none)> | 2007-07-30 21:45:06 +0200 |
| commit | 813c25108afa34f1cae77619512913f32d5c8fb1 (patch) | |
| tree | 5f6b80946cde6491267528d12fd847be02056ebc /cmd-line-utils | |
| parent | 5d4a2573328ece1002759af88457798c3e638724 (diff) | |
| parent | 46d5ebb120f17e9e2ad1490d1e572a3b0cd145bf (diff) | |
| download | mariadb-git-813c25108afa34f1cae77619512913f32d5c8fb1.tar.gz | |
Merge mysql.com:/home/kent/bk/config_h/mysql-5.0-build
into mysql.com:/home/kent/bk/config_h/mysql-5.1-build
config/ac-macros/misc.m4:
Auto merged
configure.in:
Auto merged
include/Makefile.am:
Auto merged
mysql-test/std_data/cacert.pem:
Auto merged
mysql-test/std_data/client-cert.pem:
Auto merged
mysql-test/std_data/client-key.pem:
Auto merged
mysql-test/std_data/server-cert.pem:
Auto merged
mysql-test/std_data/server-key.pem:
Auto merged
mysys/my_pthread.c:
Auto merged
scripts/make_binary_distribution.sh:
Auto merged
BitKeeper/deleted/.del-Makefile.am~de166d6fcac3b9b6:
Auto merged
Diffstat (limited to 'cmd-line-utils')
| -rw-r--r-- | cmd-line-utils/libedit/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cmd-line-utils/libedit/Makefile.am b/cmd-line-utils/libedit/Makefile.am index ae6755f1c5c..b7611193aea 100644 --- a/cmd-line-utils/libedit/Makefile.am +++ b/cmd-line-utils/libedit/Makefile.am @@ -5,8 +5,8 @@ ASRC = $(srcdir)/vi.c $(srcdir)/emacs.c $(srcdir)/common.c AHDR = vi.h emacs.h common.h -INCLUDES = -I$(top_builddir)/include -I$(top_srcdir)/include \ - -I$(srcdir)/../.. -I.. +# Make sure to include stuff from this directory first, to get right "config.h" +INCLUDES = -I. -I$(top_builddir)/include -I$(top_srcdir)/include noinst_LIBRARIES = libedit.a |