diff -Naurp insight-10.0.50.20200110.orig/gdb/configure.ac insight-10.0.50.20200110.new/gdb/configure.ac
--- insight-10.0.50.20200110.orig/gdb/configure.ac 2020-02-07 00:46:03.000000000 +0100
+++ insight-10.0.50.20200110.new/gdb/configure.ac 2020-02-07 02:41:09.909685184 +0100
@@ -593,16 +593,19 @@ if test "$with_system_readline" = yes; t
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-10.0.50.20200110.orig/gdb/doc/gdb.texinfo insight-10.0.50.20200110.new/gdb/doc/gdb.texinfo
--- insight-10.0.50.20200110.orig/gdb/doc/gdb.texinfo 2020-01-03 10:42:10.000000000 +0100
+++ insight-10.0.50.20200110.new/gdb/doc/gdb.texinfo 2020-02-07 02:41:09.917685263 +0100
@@ -37447,9 +37447,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.
@@ -37491,7 +37488,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-10.0.50.20200110.orig/gdb/doc/Makefile.in insight-10.0.50.20200110.new/gdb/doc/Makefile.in
--- insight-10.0.50.20200110.orig/gdb/doc/Makefile.in 2020-01-03 10:42:10.000000000 +0100
+++ insight-10.0.50.20200110.new/gdb/doc/Makefile.in 2020-02-07 02:41:09.917685263 +0100
@@ -128,9 +128,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-10.0.50.20200110.orig/gdb/Makefile.in insight-10.0.50.20200110.new/gdb/Makefile.in
--- insight-10.0.50.20200110.orig/gdb/Makefile.in 2020-02-07 02:38:51.532319771 +0100
+++ insight-10.0.50.20200110.new/gdb/Makefile.in 2020-02-07 02:43:33.887108619 +0100
@@ -175,8 +175,7 @@ LIBDECNUMBER_SRC = $(srcdir)/$(LIBDECNUM
LIBDECNUMBER_CFLAGS = -I$(LIBDECNUMBER_DIR) -I$(LIBDECNUMBER_SRC)
# Where is the READLINE library? Typically in ../readline/readline.
-READLINE_DIR = ../readline/readline
-READLINE_SRC = $(srcdir)/$(READLINE_DIR)
+READLINE_SRC = @READLINE_SRC@
READLINE = @READLINE@
READLINE_DEPS = @READLINE_DEPS@
READLINE_CFLAGS = @READLINE_CFLAGS@