1 diff -urN gdb-6.0.org/gdb/gdbserver/Makefile.in gdb-6.0/gdb/gdbserver/Makefile.in
2 --- gdb-6.0.org/gdb/gdbserver/Makefile.in 2003-10-09 19:42:41.000000000 +0200
3 +++ gdb-6.0/gdb/gdbserver/Makefile.in 2003-10-09 19:48:08.000000000 +0200
6 # Where is the source dir for the READLINE library? Traditionally in .. or .
7 # (For the binary library built from it, we use ${READLINE_DIR}${subdir}.)
8 -READLINE_DIR = ${srcdir}/../readline
9 +READLINE_DIR = /usr/lib
10 READLINE_DEP = $$(READLINE_DIR)
12 # All the includes used for CFLAGS and for lint.
13 diff -urN gdb-6.0.org/gdb/Makefile.in gdb-6.0/gdb/Makefile.in
14 --- gdb-6.0.org/gdb/Makefile.in 2003-10-09 19:42:39.000000000 +0200
15 +++ gdb-6.0/gdb/Makefile.in 2003-10-09 19:48:08.000000000 +0200
17 BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
19 # Where is the READLINE library? Typically in ../readline.
20 -READLINE_DIR = ../readline
21 -READLINE = $(READLINE_DIR)/libreadline.a
22 -READLINE_SRC = $(srcdir)/$(READLINE_DIR)
23 -READLINE_CFLAGS = -I$(READLINE_SRC)/..
24 +READLINE_DIR = /usr/include/readline
25 +READLINE = -lreadline
26 +READLINE_SRC = /usr/include/readline
27 +READLINE_CFLAGS = -I/usr/include/readline
29 WARN_CFLAGS = @WARN_CFLAGS@
30 WERROR_CFLAGS = @WERROR_CFLAGS@
32 $(XM_CLIBS) $(TM_CLIBS) $(NAT_CLIBS) $(GDBTKLIBS) @LIBS@ \
34 $(LIBIBERTY) $(WIN32LIBS)
35 -CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) $(READLINE) \
36 +CDEPS = $(XM_CDEPS) $(TM_CDEPS) $(NAT_CDEPS) $(SIM) $(BFD) \
37 $(OPCODES) $(INTL_DEPS) $(LIBIBERTY) $(CONFIG_DEPS)
39 ADD_FILES = $(XM_ADD_FILES) $(TM_ADD_FILES) $(NAT_ADD_FILES)
40 --- gdb-6.3/Makefile.in.orig 2004-11-08 17:21:22.000000000 +0100
41 +++ gdb-6.3/Makefile.in 2004-11-19 23:30:12.276705120 +0100
43 maybe-configure-perl \
44 maybe-configure-prms \
46 - maybe-configure-readline \
47 maybe-configure-release \
48 maybe-configure-recode \
54 - maybe-all-readline \
62 - maybe-info-readline \
70 - maybe-dvi-readline \
78 - maybe-TAGS-readline \
83 maybe-install-info-perl \
84 maybe-install-info-prms \
85 maybe-install-info-rcs \
86 - maybe-install-info-readline \
87 maybe-install-info-release \
88 maybe-install-info-recode \
89 maybe-install-info-sed \
91 maybe-installcheck-perl \
92 maybe-installcheck-prms \
93 maybe-installcheck-rcs \
94 - maybe-installcheck-readline \
95 maybe-installcheck-release \
96 maybe-installcheck-recode \
97 maybe-installcheck-sed \
99 maybe-mostlyclean-perl \
100 maybe-mostlyclean-prms \
101 maybe-mostlyclean-rcs \
102 - maybe-mostlyclean-readline \
103 maybe-mostlyclean-release \
104 maybe-mostlyclean-recode \
105 maybe-mostlyclean-sed \
106 @@ -1441,7 +1433,6 @@
110 - maybe-clean-readline \
111 maybe-clean-release \
114 @@ -1533,7 +1524,6 @@
115 maybe-distclean-perl \
116 maybe-distclean-prms \
117 maybe-distclean-rcs \
118 - maybe-distclean-readline \
119 maybe-distclean-release \
120 maybe-distclean-recode \
121 maybe-distclean-sed \
122 @@ -1625,7 +1615,6 @@
123 maybe-maintainer-clean-perl \
124 maybe-maintainer-clean-prms \
125 maybe-maintainer-clean-rcs \
126 - maybe-maintainer-clean-readline \
127 maybe-maintainer-clean-release \
128 maybe-maintainer-clean-recode \
129 maybe-maintainer-clean-sed \
130 @@ -1774,7 +1763,6 @@
134 - maybe-check-readline \
135 maybe-check-release \
138 @@ -1885,7 +1873,6 @@
142 - maybe-install-readline \
143 maybe-install-release \
144 maybe-install-recode \
146 @@ -1953,7 +1940,6 @@
150 - maybe-install-readline \
151 maybe-install-release \
152 maybe-install-recode \
154 @@ -32695,7 +32681,6 @@
155 all-gdb: maybe-all-libiberty
156 all-gdb: maybe-all-opcodes
157 all-gdb: maybe-all-bfd
158 -all-gdb: maybe-all-readline
159 all-gdb: maybe-all-build-bison
160 all-gdb: maybe-all-build-byacc
161 all-gdb: maybe-all-sim
162 @@ -32928,7 +32913,6 @@
163 all-sim: maybe-all-libiberty
164 all-sim: maybe-all-bfd
165 all-sim: maybe-all-opcodes
166 -all-sim: maybe-all-readline
167 all-sim: maybe-configure-gdb
168 all-fastjar: maybe-all-zlib
169 all-fastjar: maybe-all-build-texinfo