From cfeed64ee6661d5402bae12f86c9837bb9e6f2e1 Mon Sep 17 00:00:00 2001 From: Jim Kingdon Date: Tue, 5 Oct 1993 21:25:10 +0000 Subject: [PATCH] * Makefile.in (install, uninstall): Remove $$n.1 stuff; I don't understand what it is trying to do, but I suspect it's not doing it. * config/ns32k/merlin.mh: Add comment about M_INSTALL. * config/m88k/{delta88.mh,delta88v4.mh}: Remove M_INSTALL and M_UNINSTALL; it tries to install a non-existent file gdb.z. * Makefile.in: Remove M_INSTALL stuff; the above were the only uses. --- gdb/ChangeLog | 9 +++++++++ gdb/Makefile.in | 5 +---- gdb/config/m88k/delta88.mh | 2 -- gdb/config/m88k/delta88v4.mh | 2 -- gdb/config/ns32k/merlin.mh | 8 ++++++++ 5 files changed, 18 insertions(+), 8 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 424735f76c4..99149ee40ee 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,14 @@ Tue Oct 5 15:26:04 1993 Jim Kingdon (kingdon@lioth.cygnus.com) + * Makefile.in (install, uninstall): Remove $$n.1 stuff; I don't + understand what it is trying to do, but I suspect it's not doing + it. + + * config/ns32k/merlin.mh: Add comment about M_INSTALL. + * config/m88k/{delta88.mh,delta88v4.mh}: Remove M_INSTALL and + M_UNINSTALL; it tries to install a non-existent file gdb.z. + * Makefile.in: Remove M_INSTALL stuff; the above were the only uses. + * stabsread.c (read_range_type): Remove comment which recommends distinguishing float from complex by the name. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 20f1c6dd330..2f95de8677f 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -461,13 +461,10 @@ install: all install-only install-only: $(INSTALL_XFORM) gdb $(bindir)/gdb $(INSTALL_XFORM1) $(srcdir)/gdb.1 $(man1dir)/gdb.1 - $(INSTALL_DATA) $(srcdir)/gdb.1 $(man1dir)/$$n.1 - $(M_INSTALL) @$(MAKE) DO=install "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do uninstall: force - rm -f $(bindir)/gdb $(man1dir)/gdb.1 $(man1dir)/$$n.1 - $(M_UNINSTALL) + rm -f $(bindir)/gdb $(man1dir)/gdb.1 @$(MAKE) DO=uninstall "DODIRS=$(SUBDIRS)" $(FLAGS_TO_PASS) subdir_do init.c: munch $(OBS) $(TSOBS) diff --git a/gdb/config/m88k/delta88.mh b/gdb/config/m88k/delta88.mh index 40931430843..80716073b78 100644 --- a/gdb/config/m88k/delta88.mh +++ b/gdb/config/m88k/delta88.mh @@ -7,5 +7,3 @@ REGEX=regex.o REGEX1=regex.o # Have to use /bin/nm because a bfd nm won't do the right thing MUNCH_DEFINE=MUNCH_NM=/bin/nm -M_INSTALL=cp gdb.z $(ddestdir)/man/man1 -M_UNINSTALL = rm -f $(ddestdir)/man/man1 diff --git a/gdb/config/m88k/delta88v4.mh b/gdb/config/m88k/delta88v4.mh index 3cf43ffce2d..06da8fb2e5f 100644 --- a/gdb/config/m88k/delta88v4.mh +++ b/gdb/config/m88k/delta88v4.mh @@ -8,5 +8,3 @@ REGEX=regex.o REGEX1=regex.o # Have to use /bin/nm because a bfd nm won't do the right thing MUNCH_DEFINE=MUNCH_NM=/bin/nm -M_INSTALL=cp gdb.z $(ddestdir)/man/man1 -M_UNINSTALL = rm -f $(ddestdir)/man/man1 diff --git a/gdb/config/ns32k/merlin.mh b/gdb/config/ns32k/merlin.mh index d95ae2be7bd..eac5b6b7407 100644 --- a/gdb/config/ns32k/merlin.mh +++ b/gdb/config/ns32k/merlin.mh @@ -1,8 +1,16 @@ # Host: Merlin running utek 2.1 XDEPFILES= infptrace.o inftarg.o fork-child.o coredep.o corelow.o XM_FILE= xm-merlin.h + +# FIXME: M_INSTALL is gone from the gdb makefile. If anyone cares +# about the Merlin anymore, and the bug which inspired +# SHELL_FILE/gdb-sh is still there, will need to reinstate it. Also, +# this should be done for native only. + # 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 M_UNINSTALL = rm -f /usr/local/lib/gdb-sh -- 2.30.2