-diff -urN gdb-6.0.org/gdb/gdbserver/Makefile.in gdb-6.0/gdb/gdbserver/Makefile.in
---- gdb-6.0.org/gdb/gdbserver/Makefile.in 2003-10-09 19:42:41.000000000 +0200
-+++ gdb-6.0/gdb/gdbserver/Makefile.in 2003-10-09 19:48:08.000000000 +0200
-@@ -76,7 +76,7 @@
+diff -ur gdb-6.7.org/gdb/gdbserver/Makefile.in gdb-6.7/gdb/gdbserver/Makefile.in
+--- gdb-6.7.org/gdb/gdbserver/Makefile.in 2007-06-13 20:50:38.000000000 +0200
++++ gdb-6.7/gdb/gdbserver/Makefile.in 2007-10-10 21:10:05.379655356 +0200
+@@ -78,7 +78,7 @@
# Where is the source dir for the READLINE library? Traditionally in .. or .
# (For the binary library built from it, we use ${READLINE_DIR}${subdir}.)
READLINE_DEP = $$(READLINE_DIR)
# All the includes used for CFLAGS and for lint.
-diff -urN gdb-6.0.org/gdb/Makefile.in gdb-6.0/gdb/Makefile.in
---- gdb-6.0.org/gdb/Makefile.in 2003-10-09 19:42:39.000000000 +0200
-+++ gdb-6.0/gdb/Makefile.in 2003-10-09 19:48:08.000000000 +0200
-@@ -116,10 +116,10 @@
+diff -ur gdb-6.7.org/gdb/Makefile.in gdb-6.7/gdb/Makefile.in
+--- gdb-6.7.org/gdb/Makefile.in 2007-09-05 02:14:02.000000000 +0200
++++ gdb-6.7/gdb/Makefile.in 2007-10-10 21:11:18.119976680 +0200
+@@ -126,11 +126,11 @@
BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
# Where is the READLINE library? Typically in ../readline.
-READLINE_DIR = ../readline
--READLINE = $(READLINE_DIR)/libreadline.a
-READLINE_SRC = $(srcdir)/$(READLINE_DIR)
--READLINE_CFLAGS = -I$(READLINE_SRC)/..
+-READLINE = @READLINE@
+-READLINE_DEPS = @READLINE_DEPS@
+-READLINE_CFLAGS = @READLINE_CFLAGS@
+READLINE_DIR = /usr/include/readline
+READLINE = -lreadline
+READLINE_SRC = /usr/include/readline
++READLINE_DEPS =
+READLINE_CFLAGS = -I/usr/include/readline
- WARN_CFLAGS = @WARN_CFLAGS@
- WERROR_CFLAGS = @WERROR_CFLAGS@
-@@ -369,7 +369,7 @@
+ # Where is expat? This will be empty if expat was not available.
+ LIBEXPAT = @LIBEXPAT@
+@@ -388,7 +388,7 @@
$(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \
- $(LIBICONV) \
+ $(LIBICONV) $(LIBEXPAT) \
$(LIBIBERTY) $(WIN32LIBS)
--CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE) \
+-CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE_DEPS) \
+CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) \
$(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS)
ADD_FILES = $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES)
---- gdb-6.3/Makefile.in.orig 2004-11-08 17:21:22.000000000 +0100
-+++ gdb-6.3/Makefile.in 2004-11-19 23:30:12.276705120 +0100
-@@ -692,7 +692,6 @@
+diff -ur gdb-6.7.org/Makefile.in gdb-6.7/Makefile.in
+--- gdb-6.7.org/Makefile.in 2007-10-10 19:09:32.000000000 +0200
++++ gdb-6.7/Makefile.in 2007-10-10 21:10:23.310556251 +0200
+@@ -664,7 +664,6 @@
maybe-configure-perl \
maybe-configure-prms \
maybe-configure-rcs \
maybe-configure-release \
maybe-configure-recode \
maybe-configure-sed \
-@@ -793,7 +792,6 @@
- maybe-all-perl \
- maybe-all-prms \
- maybe-all-rcs \
-- maybe-all-readline \
- maybe-all-release \
- maybe-all-recode \
- maybe-all-sed \
-@@ -889,7 +887,6 @@
- maybe-info-perl \
- maybe-info-prms \
- maybe-info-rcs \
-- maybe-info-readline \
- maybe-info-release \
- maybe-info-recode \
- maybe-info-sed \
-@@ -981,7 +978,6 @@
- maybe-dvi-perl \
- maybe-dvi-prms \
- maybe-dvi-rcs \
-- maybe-dvi-readline \
- maybe-dvi-release \
- maybe-dvi-recode \
- maybe-dvi-sed \
-@@ -1073,7 +1069,6 @@
- maybe-TAGS-perl \
- maybe-TAGS-prms \
- maybe-TAGS-rcs \
-- maybe-TAGS-readline \
- maybe-TAGS-release \
- maybe-TAGS-recode \
- maybe-TAGS-sed \
-@@ -1165,7 +1160,6 @@
- maybe-install-info-perl \
- maybe-install-info-prms \
- maybe-install-info-rcs \
-- maybe-install-info-readline \
- maybe-install-info-release \
- maybe-install-info-recode \
- maybe-install-info-sed \
-@@ -1257,7 +1251,6 @@
- maybe-installcheck-perl \
- maybe-installcheck-prms \
- maybe-installcheck-rcs \
-- maybe-installcheck-readline \
- maybe-installcheck-release \
- maybe-installcheck-recode \
- maybe-installcheck-sed \
-@@ -1349,7 +1342,6 @@
- maybe-mostlyclean-perl \
- maybe-mostlyclean-prms \
- maybe-mostlyclean-rcs \
-- maybe-mostlyclean-readline \
- maybe-mostlyclean-release \
- maybe-mostlyclean-recode \
- maybe-mostlyclean-sed \
-@@ -1441,7 +1433,6 @@
- maybe-clean-perl \
- maybe-clean-prms \
- maybe-clean-rcs \
-- maybe-clean-readline \
- maybe-clean-release \
- maybe-clean-recode \
- maybe-clean-sed \
-@@ -1533,7 +1524,6 @@
- maybe-distclean-perl \
- maybe-distclean-prms \
- maybe-distclean-rcs \
-- maybe-distclean-readline \
- maybe-distclean-release \
- maybe-distclean-recode \
- maybe-distclean-sed \
-@@ -1625,7 +1615,6 @@
- maybe-maintainer-clean-perl \
- maybe-maintainer-clean-prms \
- maybe-maintainer-clean-rcs \
-- maybe-maintainer-clean-readline \
- maybe-maintainer-clean-release \
- maybe-maintainer-clean-recode \
- maybe-maintainer-clean-sed \
-@@ -1774,7 +1763,6 @@
+@@ -812,7 +811,6 @@
+ all-host: maybe-all-perl
+ all-host: maybe-all-prms
+ all-host: maybe-all-rcs
+-all-host: maybe-all-readline
+ all-host: maybe-all-release
+ all-host: maybe-all-recode
+ all-host: maybe-all-sed
+@@ -927,7 +925,6 @@
+ info-host: maybe-info-perl
+ info-host: maybe-info-prms
+ info-host: maybe-info-rcs
+-info-host: maybe-info-readline
+ info-host: maybe-info-release
+ info-host: maybe-info-recode
+ info-host: maybe-info-sed
+@@ -1033,7 +1030,6 @@
+ dvi-host: maybe-dvi-perl
+ dvi-host: maybe-dvi-prms
+ dvi-host: maybe-dvi-rcs
+-dvi-host: maybe-dvi-readline
+ dvi-host: maybe-dvi-release
+ dvi-host: maybe-dvi-recode
+ dvi-host: maybe-dvi-sed
+@@ -1245,7 +1241,6 @@
+ html-host: maybe-html-perl
+ html-host: maybe-html-prms
+ html-host: maybe-html-rcs
+-html-host: maybe-html-readline
+ html-host: maybe-html-release
+ html-host: maybe-html-recode
+ html-host: maybe-html-sed
+@@ -1351,7 +1346,6 @@
+ TAGS-host: maybe-TAGS-perl
+ TAGS-host: maybe-TAGS-prms
+ TAGS-host: maybe-TAGS-rcs
+-TAGS-host: maybe-TAGS-readline
+ TAGS-host: maybe-TAGS-release
+ TAGS-host: maybe-TAGS-recode
+ TAGS-host: maybe-TAGS-sed
+@@ -1457,7 +1451,6 @@
+ install-info-host: maybe-install-info-perl
+ install-info-host: maybe-install-info-prms
+ install-info-host: maybe-install-info-rcs
+-install-info-host: maybe-install-info-readline
+ install-info-host: maybe-install-info-release
+ install-info-host: maybe-install-info-recode
+ install-info-host: maybe-install-info-sed
+@@ -1669,7 +1662,6 @@
+ install-html-host: maybe-install-html-perl
+ install-html-host: maybe-install-html-prms
+ install-html-host: maybe-install-html-rcs
+-install-html-host: maybe-install-html-readline
+ install-html-host: maybe-install-html-release
+ install-html-host: maybe-install-html-recode
+ install-html-host: maybe-install-html-sed
+@@ -1775,7 +1767,6 @@
+ installcheck-host: maybe-installcheck-perl
+ installcheck-host: maybe-installcheck-prms
+ installcheck-host: maybe-installcheck-rcs
+-installcheck-host: maybe-installcheck-readline
+ installcheck-host: maybe-installcheck-release
+ installcheck-host: maybe-installcheck-recode
+ installcheck-host: maybe-installcheck-sed
+@@ -1881,7 +1872,6 @@
+ mostlyclean-host: maybe-mostlyclean-perl
+ mostlyclean-host: maybe-mostlyclean-prms
+ mostlyclean-host: maybe-mostlyclean-rcs
+-mostlyclean-host: maybe-mostlyclean-readline
+ mostlyclean-host: maybe-mostlyclean-release
+ mostlyclean-host: maybe-mostlyclean-recode
+ mostlyclean-host: maybe-mostlyclean-sed
+@@ -1987,7 +1977,6 @@
+ clean-host: maybe-clean-perl
+ clean-host: maybe-clean-prms
+ clean-host: maybe-clean-rcs
+-clean-host: maybe-clean-readline
+ clean-host: maybe-clean-release
+ clean-host: maybe-clean-recode
+ clean-host: maybe-clean-sed
+@@ -2093,7 +2082,6 @@
+ distclean-host: maybe-distclean-perl
+ distclean-host: maybe-distclean-prms
+ distclean-host: maybe-distclean-rcs
+-distclean-host: maybe-distclean-readline
+ distclean-host: maybe-distclean-release
+ distclean-host: maybe-distclean-recode
+ distclean-host: maybe-distclean-sed
+@@ -2199,7 +2187,6 @@
+ maintainer-clean-host: maybe-maintainer-clean-perl
+ maintainer-clean-host: maybe-maintainer-clean-prms
+ maintainer-clean-host: maybe-maintainer-clean-rcs
+-maintainer-clean-host: maybe-maintainer-clean-readline
+ maintainer-clean-host: maybe-maintainer-clean-release
+ maintainer-clean-host: maybe-maintainer-clean-recode
+ maintainer-clean-host: maybe-maintainer-clean-sed
+@@ -2359,7 +2346,6 @@
maybe-check-perl \
maybe-check-prms \
maybe-check-rcs \
maybe-check-release \
maybe-check-recode \
maybe-check-sed \
-@@ -1885,7 +1873,6 @@
+@@ -2491,7 +2477,6 @@
maybe-install-perl \
maybe-install-prms \
maybe-install-rcs \
maybe-install-release \
maybe-install-recode \
maybe-install-sed \
-@@ -1953,7 +1940,6 @@
+@@ -2564,7 +2549,6 @@
maybe-install-perl \
maybe-install-prms \
maybe-install-rcs \
maybe-install-release \
maybe-install-recode \
maybe-install-sed \
-@@ -32695,7 +32681,6 @@
+@@ -51494,7 +51478,6 @@
+ all-gdb: maybe-all-intl
all-gdb: maybe-all-libiberty
all-gdb: maybe-all-opcodes
- all-gdb: maybe-all-bfd
-all-gdb: maybe-all-readline
all-gdb: maybe-all-build-bison
all-gdb: maybe-all-build-byacc
all-gdb: maybe-all-sim
-@@ -32928,7 +32913,6 @@
+@@ -51826,7 +51809,6 @@
all-sim: maybe-all-libiberty
all-sim: maybe-all-bfd
all-sim: maybe-all-opcodes