diff options
| -rw-r--r-- | .bzrignore | 1 | ||||
| -rw-r--r-- | cmd-line-utils/readline/Makefile.am | 2 | ||||
| -rw-r--r-- | configure.in | 4 | ||||
| -rw-r--r-- | include/Makefile.am | 10 |
4 files changed, 8 insertions, 9 deletions
diff --git a/.bzrignore b/.bzrignore index f87851d3e77..ab096c20d6e 100644 --- a/.bzrignore +++ b/.bzrignore @@ -773,3 +773,4 @@ ndb/lib/libREP_API.so ndb/lib/libndbclient.so ndb/lib/libndbclient_extra.so libmysqld/discover.cc +include/readline diff --git a/cmd-line-utils/readline/Makefile.am b/cmd-line-utils/readline/Makefile.am index 86c5c5ccc19..7c4fe8eeb91 100644 --- a/cmd-line-utils/readline/Makefile.am +++ b/cmd-line-utils/readline/Makefile.am @@ -3,7 +3,7 @@ # Copyright (C) 1994,1996,1997 Free Software Foundation, Inc. # Last -I$(top_srcdir) needed for RedHat! -INCLUDES = -I.. -I$(top_srcdir)/include -I$(top_srcdir) +INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir) noinst_LIBRARIES = libreadline.a diff --git a/configure.in b/configure.in index 94e0ea0aad2..6ccbf087b91 100644 --- a/configure.in +++ b/configure.in @@ -2235,7 +2235,7 @@ then readline_basedir="libedit" readline_dir="$readline_topdir/$readline_basedir" readline_link="\$(top_builddir)/cmd-line-utils/libedit/liblibedit.a" - readline_h_ln_cmd="\$(LN) -s \$(top_builddir)/cmd-line-utils/libedit/readline/*.h readline/" + readline_h_ln_cmd="\$(LN) -s \$(top_builddir)/cmd-line-utils/libedit/readline readline" compile_libedit=yes AC_DEFINE_UNQUOTED(USE_LIBEDIT_INTERFACE) elif test "$with_readline" = "yes" @@ -2244,7 +2244,7 @@ then readline_basedir="readline" readline_dir="$readline_topdir/$readline_basedir" readline_link="\$(top_builddir)/cmd-line-utils/readline/libreadline.a" - readline_h_ln_cmd="\$(LN) -s \$(top_builddir)/cmd-line-utils/readline/*.h readline/" + readline_h_ln_cmd="\$(LN) -s \$(top_builddir)/cmd-line-utils/readline readline" compile_readline=yes AC_DEFINE_UNQUOTED(USE_NEW_READLINE_INTERFACE) else diff --git a/include/Makefile.am b/include/Makefile.am index 8f71298bbcf..01b8f295be4 100644 --- a/include/Makefile.am +++ b/include/Makefile.am @@ -39,25 +39,23 @@ SUPERCLEANFILES = mysql_version.h my_config.h DISTCLEANFILES = sched.h $(SUPERCLEANFILES) clean: - $(RM) -f readline/* + $(RM) -fr readline distclean: - $(RM) -f readline/* + $(RM) -fr readline all-local: my_config.h # Since we include my_config.h it better exist from the beginning link_sources: $(CP) ../config.h my_config.h - $(RM) -fr readline/* - -mkdir readline + -$(RM) -fr readline @readline_h_ln_cmd@ # Keep automake happy my_config.h: ../config.h $(CP) ../config.h my_config.h - $(RM) -fr readline/* - -mkdir readline + -$(RM) -fr readline @readline_h_ln_cmd@ # These files should not be included in distributions since they are |