diff -Naurp insight-8.2.50.20190118.orig/gdb/configure.ac insight-8.2.50.20190118.new/gdb/configure.ac
--- insight-8.2.50.20190118.orig/gdb/configure.ac 2019-01-20 14:19:52.000000000 +0100
+++ insight-8.2.50.20190118.new/gdb/configure.ac 2019-01-20 15:12:55.568064320 +0100
@@ -605,16 +605,19 @@ AC_ARG_WITH([system-readline],
if test "$with_system_readline" = yes; then
READLINE=-lreadline
READLINE_DEPS=
+ READLINE_SRC='$(includedir)/readline'
READLINE_CFLAGS=
READLINE_TEXI_INCFLAG=
else
READLINE='$(READLINE_DIR)/libreadline.a'
READLINE_DEPS='$(READLINE)'
+ READLINE_SRC='$(srcdir)/../readline'
READLINE_CFLAGS='-I$(READLINE_SRC)/..'
READLINE_TEXI_INCFLAG='-I $(READLINE_DIR)'
fi
AC_SUBST(READLINE)
AC_SUBST(READLINE_DEPS)
+AC_SUBST(READLINE_SRC)
AC_SUBST(READLINE_CFLAGS)
AC_SUBST(READLINE_TEXI_INCFLAG)
diff -Naurp insight-8.2.50.20190118.orig/gdb/doc/gdb.texinfo insight-8.2.50.20190118.new/gdb/doc/gdb.texinfo
--- insight-8.2.50.20190118.orig/gdb/doc/gdb.texinfo 2019-01-18 01:25:51.000000000 +0100
+++ insight-8.2.50.20190118.new/gdb/doc/gdb.texinfo 2019-01-20 15:17:04.099507190 +0100
@@ -35657,9 +35657,6 @@ source for the @samp{-liberty} free soft
@item gdb-@value{GDBVN}/opcodes
source for the library of opcode tables and disassemblers
-
-@item gdb-@value{GDBVN}/readline
-source for the @sc{gnu} command-line interface
@end table
There may be other subdirectories as well.
@@ -35701,7 +35698,7 @@ source tree, the @file{gdb-@var{version-
that subdirectory. That is usually not what you want. In particular,
if you run the first @file{configure} from the @file{gdb} subdirectory
of the @file{gdb-@var{version-number}} directory, you will omit the
-configuration of @file{bfd}, @file{readline}, and other sibling
+configuration of @file{bfd}, and other sibling
directories of the @file{gdb} subdirectory. This leads to build errors
about missing include files such as @file{bfd/bfd.h}.
diff -Naurp insight-8.2.50.20190118.orig/gdb/doc/Makefile.in insight-8.2.50.20190118.new/gdb/doc/Makefile.in
--- insight-8.2.50.20190118.orig/gdb/doc/Makefile.in 2019-01-01 13:50:42.000000000 +0100
+++ insight-8.2.50.20190118.new/gdb/doc/Makefile.in 2019-01-20 15:12:55.584064478 +0100
@@ -127,9 +127,7 @@ DVIPS = dvips
GDB_DOC_SOURCE_INCLUDES = \
$(srcdir)/fdl.texi \
$(srcdir)/gpl.texi \
- $(srcdir)/agentexpr.texi \
- $(READLINE_DIR)/rluser.texi \
- $(READLINE_DIR)/hsuser.texi
+ $(srcdir)/agentexpr.texi
GDB_DOC_BUILD_INCLUDES = \
gdb-cfg.texi \
GDBvn.texi
diff -Naurp insight-8.2.50.20190118.orig/gdb/Makefile.in insight-8.2.50.20190118.new/gdb/Makefile.in
--- insight-8.2.50.20190118.orig/gdb/Makefile.in 2019-01-20 15:11:20.365126216 +0100
+++ insight-8.2.50.20190118.new/gdb/Makefile.in 2019-01-20 15:12:55.585064488 +0100
@@ -172,8 +172,7 @@ LIBDECNUMBER_SRC = $(srcdir)/$(LIBDECNUM
LIBDECNUMBER_CFLAGS = -I$(LIBDECNUMBER_DIR) -I$(LIBDECNUMBER_SRC)
# Where is the READLINE library? Typically in ../readline.
-READLINE_DIR = ../readline
-READLINE_SRC = $(srcdir)/$(READLINE_DIR)
+READLINE_SRC = @READLINE_SRC@
READLINE = @READLINE@
READLINE_DEPS = @READLINE_DEPS@
READLINE_CFLAGS = @READLINE_CFLAGS@