From af3711e6b3e0942f07d757f07c6bcaa044dddd09 Mon Sep 17 00:00:00 2001
From: "Frank Ch. Eigler" <fche@redhat.com>
Date: Wed, 28 Oct 1998 16:08:03 +0000
Subject: [PATCH] * peripheral part of sky->devo merge * patch approved by
 shebs Wed Oct 28 12:33:52 EST 1998  Frank Ch. Eigler <fche@cygnus.com> 
 * configure.in: Accept both -skyb- and -sky- for 	--with-sim-funit/gpu2
 options. 	* configure: Rebuilt.

---
 gdb/ChangeLog    | 8 ++++++++
 gdb/configure    | 4 ++--
 gdb/configure.in | 4 ++--
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 40e6fc16f4..22a8a15e5d 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,11 @@
+start-sanitize-sky
+Wed Oct 28 12:33:52 EST 1998  Frank Ch. Eigler <fche@cygnus.com>
+
+	* configure.in: Accept both -skyb- and -sky- for
+	--with-sim-funit/gpu2 options.
+	* configure: Rebuilt.
+
+end-sanitize-sky
 Wed Oct 28 08:01:38 1998  Mark Alexander  <marka@cygnus.com>
 
 	* sparcl-tdep.c (send_resp, sparclite_serial_start,
diff --git a/gdb/configure b/gdb/configure
index f69fa31e02..48c9b10ad0 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -5773,7 +5773,7 @@ fi
 if test "${with_sim_gpu2+set}" = set; then
   withval="$with_sim_gpu2"
   case "${target}" in
-  mips*-sky-*)
+  mips*-sky*-*)
     if test -d "${withval}"
     then
       LIBS="${LIBS} -L${withval}/lib -lgpu2 -L${x_libraries} -lX11 -lXext"
@@ -5789,7 +5789,7 @@ fi
 if test "${with_sim_funit+set}" = set; then
   withval="$with_sim_funit"
   case "${target}" in
-  mips*-sky-*)
+  mips*-sky*-*)
     if test -d "${withval}"
     then
       LIBS="${LIBS} -L${withval}/lib -lfunit"
diff --git a/gdb/configure.in b/gdb/configure.in
index d1537ad08f..2bb1cee4cb 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -665,7 +665,7 @@ AC_PATH_X
 AC_ARG_WITH(sim-gpu2,
 [  --with-sim-gpu2=DIR     Use GPU2 library under given DIR],
 [case "${target}" in
-  mips*-sky-*)
+  mips*-sky*-*)
     if test -d "${withval}"
     then
       LIBS="${LIBS} -L${withval}/lib -lgpu2 -L${x_libraries} -lX11 -lXext"
@@ -679,7 +679,7 @@ esac])dnl
 AC_ARG_WITH(sim-funit,
 [  --with-sim-funit=DIR    Use target FP lib under given DIR],
 [case "${target}" in
-  mips*-sky-*)
+  mips*-sky*-*)
     if test -d "${withval}"
     then
       LIBS="${LIBS} -L${withval}/lib -lfunit"