From a952ea1cb86428d50d20cdee90c5705100c8ae2a Mon Sep 17 00:00:00 2001
From: Stan Shebs <shebs@codesourcery.com>
Date: Thu, 15 Aug 1996 20:13:38 +0000
Subject: [PATCH] 	* mpw-make.sed: Update editing of include pathnames to
 be 	more general.

---
 opcodes/ChangeLog    | 9 +++++++++
 opcodes/mpw-make.sed | 6 ++++--
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog
index 7ee522f..0e6bbd0 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,12 @@
+Thu Aug 15 13:11:13 1996  Stan Shebs  <shebs@andros.cygnus.com>
+
+	* mpw-make.sed: Update editing of include pathnames to be
+	more general.
+
+Thu Aug 15 16:28:41 1996  James G. Smith  <jsmith@cygnus.co.uk>
+
+	* arm-opc.h: Added "bx" instruction definition.
+
 Wed Aug 14 17:00:04 1996  Richard Henderson  <rth@tamu.edu>
 
 	* alpha-opc.c (EV4EXTHWINDEX): Field width should be 8 not 5.
diff --git a/opcodes/mpw-make.sed b/opcodes/mpw-make.sed
index 5faa927..ee60486 100644
--- a/opcodes/mpw-make.sed
+++ b/opcodes/mpw-make.sed
@@ -3,8 +3,10 @@
 # Empty HDEFINES.
 /HDEFINES/s/@HDEFINES@//
 
-/INCDIR=/s/"{srcdir}":/"{topsrcdir}"/
-/^CSEARCH = .*$/s/$/ -i "{INCDIR}":mpw: -i ::extra-include:/
+# Fix pathnames to include directories.
+/^INCDIR = /s/^INCDIR = .*$/INCDIR = "{topsrcdir}"include/
+/^CSEARCH = /s/$/ -i "{INCDIR}":mpw: -i ::extra-include:/
+
 /BFD_MACHINES/s/@BFD_MACHINES@/{BFD_MACHINES}/
 /archdefs/s/@archdefs@/{ARCHDEFS}/
 
-- 
2.7.4