From 0bf2ba41ef3123cd52ec37634031ac8d935d0070 Mon Sep 17 00:00:00 2001
From: Per Bothner <per@bothner.com>
Date: Wed, 23 Dec 1998 23:06:11 +0000
Subject: [PATCH] 	* Makefile.in (READLINE_CFLAGS):  Search
 $(READLINE_SRC)/.. rather 	than $(READLINE_SRC) so #include
 <readline/readline.h> will work. 	* top.c:  #include
 <readline/history.h> instead of "history.h". 	* tracepoint.c:  Likewise. 
 * mac-xdep.c:  Likewise.

---
 gdb/ChangeLog    | 8 ++++++++
 gdb/Makefile.in  | 8 ++++----
 gdb/mac-xdep.c   | 4 ++--
 gdb/top.c        | 4 ++--
 gdb/tracepoint.c | 4 ++--
 5 files changed, 18 insertions(+), 10 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 896db44c1ad..806c61c09d3 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+Wed Dec 23 15:03:42 1998  Per Bothner  <bothner@cygnus.com>
+
+	* Makefile.in (READLINE_CFLAGS):  Search $(READLINE_SRC)/.. rather
+	than $(READLINE_SRC) so #include <readline/readline.h> will work.
+	* top.c:  #include <readline/history.h> instead of "history.h".
+	* tracepoint.c:  Likewise.
+	* mac-xdep.c:  Likewise.
+
 Wed Dec 23 12:32:00 1998  Andrew Cagney  <cagney@chook.cygnus.com>
 
 	* defs.h (TARGET_FLOAT_FORMAT, TARGET_DOUBLE_FORMAT): Define using
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 6831a6e6a4d..6429fb06fc4 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -105,7 +105,7 @@ BFD_CFLAGS = -I$(BFD_DIR) -I$(BFD_SRC)
 READLINE_DIR = ../readline
 READLINE = $(READLINE_DIR)/libreadline.a
 READLINE_SRC = $(srcdir)/$(READLINE_DIR)
-READLINE_CFLAGS = -I$(READLINE_SRC)
+READLINE_CFLAGS = -I$(READLINE_SRC)/..
 
 WARN_CFLAGS = @WARN_CFLAGS@
 
@@ -168,16 +168,16 @@ ENABLE_GDBTK= @ENABLE_GDBTK@
 ENABLE_IDE= @ENABLE_IDE@
 
 FOUNDRY_LIB_BASE= @FOUNDRY_LIB_BASE@
-LIBGUI = @LIBGUI@
-GUI_CFLAGS_X = @GUI_CFLAGS_X@
 IDE_CFLAGS_X = @IDE_CFLAGS_X@
 IDE_X = @IDE_X@
 LIBIDETCL = @LIBIDETCL@
 LIBIDE = @LIBIDE@
 IDE_DEPS = @IDE_DEPS@
 IDE=$(IDE_X) 
-IDE_CFLAGS=$(GUI_CFLAGS_X) $(IDE_CFLAGS_X)
 #end-sanitize-ide
+LIBGUI = @LIBGUI@
+GUI_CFLAGS_X = @GUI_CFLAGS_X@
+IDE_CFLAGS=$(GUI_CFLAGS_X) $(IDE_CFLAGS_X)
 #end-sanitize-gdbtk
 
 ENABLE_CFLAGS= @ENABLE_CFLAGS@
diff --git a/gdb/mac-xdep.c b/gdb/mac-xdep.c
index 20a79a53c88..bf3f78deb1f 100644
--- a/gdb/mac-xdep.c
+++ b/gdb/mac-xdep.c
@@ -20,8 +20,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 
 #include "defs.h"
 
-#include "readline.h"
-#include "history.h"
+#include <readline/readline.h>
+#include <readline/history.h>
 
 #include <Types.h>
 #include <Resources.h>
diff --git a/gdb/top.c b/gdb/top.c
index dbbc5436b96..2f7ac51faba 100644
--- a/gdb/top.c
+++ b/gdb/top.c
@@ -36,8 +36,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "top.h"
 
 /* readline include files */
-#include "readline/readline.h"
-#include "history.h"
+#include <readline/readline.h>
+#include <readline/history.h>
 
 /* readline defines this.  */
 #undef savestring
diff --git a/gdb/tracepoint.c b/gdb/tracepoint.c
index 610ee4084f6..9f036178bd1 100644
--- a/gdb/tracepoint.c
+++ b/gdb/tracepoint.c
@@ -33,8 +33,8 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.  */
 #include "ax-gdb.h"
 
 /* readline include files */
-#include "readline/readline.h"
-#include "history.h"
+#include <readline/readline.h>
+#include <readline/history.h>
 
 /* readline defines this.  */
 #undef savestring
-- 
2.30.2