Sat Dec 7 00:00:15 1991 K. Richard Pixley (rich at rtl.cygnus.com)

	* Makefile.in: install using INSTALL_PROGRAM and INSTALL_DATA.
	  added clean-info.  added some standards.text support and made it
	  look like our other Makefiles.

	* configure.in: mark this directory target dependent.  configure
	  now runs entirely in objdir so make existence tests and
	  references against ${srcdir}.

Thu Dec  5 22:46:13 1991  K. Richard Pixley  (rich at rtl.cygnus.com)

	* Makefile.in: idestdir and ddestdir go away.  Added copyrights
	  and shift gpl to v2.  Added ChangeLog if it didn't exist. docdir
	  and mandir now keyed off datadir by default.

3 files changed, 62 insertions, 18 deletions

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 34c2e95..878e936 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,9 +1,25 @@
+Sat Dec  7 00:00:15 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Makefile.in: install using INSTALL_PROGRAM and INSTALL_DATA.
+	  added clean-info.  added some standards.text support and made it
+	  look like our other Makefiles.
+
+	* configure.in: mark this directory target dependent.  configure
+	  now runs entirely in objdir so make existence tests and
+	  references against ${srcdir}.
+
 Fri Dec  6 08:30:36 1991  Fred Fish  (fnf at cygnus.com)
 
 	* dwarfread.c (enum_type, struct_type):  Fixes for opaque and
 	anonymous enumerations, structures, and unions.  Now passes all
 	the current gdb test suite tests.
 
+Thu Dec  5 22:46:13 1991  K. Richard Pixley  (rich at rtl.cygnus.com)
+
+	* Makefile.in: idestdir and ddestdir go away.  Added copyrights
+	  and shift gpl to v2.  Added ChangeLog if it didn't exist. docdir
+	  and mandir now keyed off datadir by default.
+
 Thu Dec  5 21:53:21 1991  John Gilmore  (gnu at cygnus.com)
 
 	* symtab.c (decode_line_1):  If SKIP_PROLOGUE leaves us in
diff --git a/gdb/Makefile.in b/gdb/Makefile.in
index 82f71ce..64c1709 100644
--- a/gdb/Makefile.in
+++ b/gdb/Makefile.in
@@ -16,16 +16,42 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
+prefix = /usr/local
+
+bindir = $(prefix)/bin
+datadir = $(prefix)/lib
+libdir = $(prefix)/lib
+mandir = $(datadir)/man
+man1dir = $(mandir)/man1
+man2dir = $(mandir)/man2
+man3dir = $(mandir)/man3
+man4dir = $(mandir)/man4
+man5dir = $(mandir)/man5
+man6dir = $(mandir)/man6
+man7dir = $(mandir)/man7
+man8dir = $(mandir)/man8
+man9dir = $(mandir)/man9
+infodir = $(prefix)/info
+includedir = $(prefix)/include
+docdir = $(datadir)/doc
+
+SHELL = /bin/sh
+
+INSTALL = install -c
+INSTALL_PROGRAM = $(INSTALL)
+INSTALL_DATA = $(INSTALL)
+
+AR = ar
+AR_FLAGS = qv
+RANLIB = ranlib
+
+#### Host, target, and site specific Makefile fragments come in here.
+###
+
 # Host and target-dependent makefile fragments come in here.
 ####
 # End of host and target-dependent makefile fragments
 
-# Destination directory of the software tree build
-ddestdir = /usr/local
-
-# Place to install binaries in the destination tree. 
-bindir=$(ddestdir)/bin
-
 # System V: If you compile gdb with a compiler which uses the coff
 # encapsulation feature (this is a function of the compiler used, NOT
 # of the m-?.h file selected by config.gdb), you must make sure that
@@ -52,7 +78,6 @@ BISON=bison -y
 BISONFLAGS=
 YACC=$(BISON) $(BISONFLAGS)
 # YACC=yacc
-SHELL=/bin/sh
 MAKE=make
 
 # Documentation (gdb.dvi) needs either GNU m4 or SysV m4; 
@@ -133,7 +158,7 @@ CDEPS = ${XM_CDEPS} ${TM_CDEPS} ${BFD_LIB} ${LIBIBERTY} ${RL_LIB}
 ADD_FILES = ${REGEX} ${ALLOCA}  ${GNU_MALLOC} ${XM_ADD_FILES} ${TM_ADD_FILES}
 ADD_DEPS = ${REGEX1} ${ALLOCA1} ${GNU_MALLOC} ${XM_ADD_FILES} ${TM_ADD_FILES}
 
-VERSION = 4.2.95
+VERSION = 4.2.96
 DIST=gdb
 
 LINT=/usr/5bin/lint
@@ -276,19 +301,20 @@ YYOBJ = c-exp.tab.o m2-exp.tab.o
 
 all: gdb
 	$(MAKE) subdir_do DO=all "DODIRS=$(SUBDIRS)"
-all-info: force
-	$(MAKE) subdir_do DO=all-info "DODIRS=$(SUBDIRS)"
+info: force
+	$(MAKE) subdir_do DO=info "DODIRS=$(SUBDIRS)"
 install-info: force
 	$(MAKE) subdir_do DO=install-info "DODIRS=$(SUBDIRS)"
+clean-info: force
+	$(MAKE) subdir_do DO=clean-info "DODIRS=$(SUBDIRS)"
 
 gdb.z:gdb.1
 	nroff -man gdb.1 | col -b > gdb.t 
 	pack gdb.t ; rm -f gdb.t
 	mv gdb.t.z gdb.z
 	
-install: gdb gdb.z
-	cp gdb $(bindir)/gdb.new
-	mv $(bindir)/gdb.new $(bindir)/gdb
+install: gdb 
+	$(INSTALL_PROGRAM) gdb $(bindir)/gdb
 	$(M_INSTALL)
 	$(MAKE) subdir_do DO=install "DODIRS=$(SUBDIRS)"
 
@@ -539,8 +565,8 @@ subdir_do: force
 				$(MAKE) \
 					"against=$(against)" \
 					"AR=$(AR)" \
-					"CC=$(CC)" \
 					"AR_FLAGS=$(AR_FLAGS)" \
+					"CC=$(CC)" \
 					"RANLIB=$(RANLIB)" \
 					"BISON=$(BISON)" $(DO)) ; then true ; \
 			else exit 1 ; fi ; \
diff --git a/gdb/configure.in b/gdb/configure.in
index 81d1193..e261aab 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -1,6 +1,8 @@
 configdirs="doc"
 srcname="GDB"
 srctrigger=main.c
+target_dependent=true
+
 # per-host:
 
 # map host info into gdb names.
@@ -134,13 +136,13 @@ arm | vax | merlin | none | np1 | pn | pyramid | tahoe)
 esac
 
 
-if [ ! -f config/mh-${gdb_host} ]; then
+if [ ! -f ${srcdir}/config/mh-${gdb_host} ]; then
 	echo '***' "Gdb does not support host ${host}" 1>&2
 	exit 1
 fi
 
 #  We really shouldn't depend on there being a space after XM_FILE= ...
-hostfile=`awk '$1 == "XM_FILE=" { print $2 }' <config/mh-${gdb_host}`
+hostfile=`awk '$1 == "XM_FILE=" { print $2 }' <${srcdir}/config/mh-${gdb_host}`
 
 # per-target:
 
@@ -275,7 +277,7 @@ rs6000)
 
 esac
 
-if [ ! -f config/mt-${gdb_target} ]; then
+if [ ! -f ${srcdir}/config/mt-${gdb_target} ]; then
 	echo '***' "Gdb does not support target ${target}" 1>&2
 	exit 1
 fi
@@ -286,7 +288,7 @@ if [ -z "${removing}" ] ; then
 fi
 
 #  We really shouldn't depend on there being a space after TM_FILE= ...
-targetfile=`awk '$1 == "TM_FILE=" { print $2 }' <config/mt-${gdb_target}`
+targetfile=`awk '$1 == "TM_FILE=" { print $2 }' <${srcdir}/config/mt-${gdb_target}`
 
 host_makefile_frag=config/mh-${gdb_host}
 target_makefile_frag=config/mt-${gdb_target}