* config/ns32k/{merlin.mh,xm-merlin.h}: Be consistent about name

	of gdb-sh.

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3753b246ac9596baba9a582930a1336789d9a8b2..69c362f504ecd6be8991e723d969ecf045199c33 100644 (file)
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,5 +1,7 @@
 Wed Jun 23 00:25:58 1993  Jim Kingdon  (kingdon@lioth.cygnus.com)
 
+       * config/ns32k/{merlin.mh,xm-merlin.h}: Be consistent about name.
+
        * dbxread.c (copy_pending): Change name and function of begi argument
        to endi, since that is what the caller needs.
 

diff --git a/gdb/config/ns32k/merlin.mh b/gdb/config/ns32k/merlin.mh
index 179254b7ecea83f51111cfef260b9bb5b4e8b6c3..38a90b6fae6dca7e42cb6a70747ebdd3910aace2 100644 (file)
--- a/gdb/config/ns32k/merlin.mh
+++ b/gdb/config/ns32k/merlin.mh
@@ -1,6 +1,7 @@
 # Host: Merlin running utek 2.1
 XDEPFILES= infptrace.o inftarg.o fork-child.o coredep.o corelow.o
 XM_FILE= xm-merlin.h
-# See SHELL_FILE in m-merlin.h for a explanation of this.
+# See SHELL_FILE in xm-merlin.h for a explanation of this.
+# FIXME: This should use $prefix, but only if SHELL_FILE does too.
 M_INSTALL=cp /bin/sh /usr/local/lib/gdb-sh; \
 chmod ogu+rw /usr/local/lib/gdb-sh

diff --git a/gdb/config/ns32k/xm-merlin.h b/gdb/config/ns32k/xm-merlin.h
index 7cbba1c6003e5b807e50fbf88af2404b98ccfac4..b77c90fb9eae56083d5133670311943d79d53ba5 100644 (file)
--- a/gdb/config/ns32k/xm-merlin.h
+++ b/gdb/config/ns32k/xm-merlin.h
@@ -25,7 +25,8 @@ Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* Under Utek, a ptrace'd process can be the only active process for
    an executable.  Therefore instead of /bin/sh use gdb-sh (which should
    just be a copy of /bin/sh which is world readable and writeable).  */
-#define SHELL_FILE "/usr/gnu/lib/gdb-sh"
+/* FIXME: name should be passed in from Makefile so it can use prefix.  */
+#define SHELL_FILE "/usr/local/lib/gdb-sh"
 
 #define HOST_BYTE_ORDER LITTLE_ENDIAN