aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJim Kingdon <jkingdon@engr.sgi.com>1993-06-23 19:44:05 +0000
committerJim Kingdon <jkingdon@engr.sgi.com>1993-06-23 19:44:05 +0000
commit6ffbfcc2a5797c214c54452a1fa72acd6ad71768 (patch)
tree0ea22781a29f6d255b860ec4b1a7e26ce0de9ff7
parentec06a3cb25f86ac6f0e748b22ca3fefe888162e0 (diff)
downloadgdb-6ffbfcc2a5797c214c54452a1fa72acd6ad71768.zip
gdb-6ffbfcc2a5797c214c54452a1fa72acd6ad71768.tar.gz
gdb-6ffbfcc2a5797c214c54452a1fa72acd6ad71768.tar.bz2
* config/ns32k/{merlin.mh,xm-merlin.h}: Be consistent about name
of gdb-sh.
-rw-r--r--gdb/ChangeLog2
-rw-r--r--gdb/config/ns32k/merlin.mh3
-rw-r--r--gdb/config/ns32k/xm-merlin.h3
3 files changed, 6 insertions, 2 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 3753b24..69c362f 100644
--- 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 179254b..38a90b6 100644
--- 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 7cbba1c..b77c90f 100644
--- 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