summaryrefslogtreecommitdiff
path: root/cmd-line-utils
diff options
context:
space:
mode:
authorkent@kent-amd64.(none) <>2007-07-30 21:45:06 +0200
committerkent@kent-amd64.(none) <>2007-07-30 21:45:06 +0200
commitfd3b865149faced7ef5ff1696109df576f44d508 (patch)
tree5f6b80946cde6491267528d12fd847be02056ebc /cmd-line-utils
parentce5044072e851b5af9e25995ed260a2cdbc316ed (diff)
parent01ad4893562aff4bad9ce94285942e8405034ebb (diff)
downloadmariadb-git-fd3b865149faced7ef5ff1696109df576f44d508.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
Diffstat (limited to 'cmd-line-utils')
-rw-r--r--cmd-line-utils/libedit/Makefile.am4
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