From 4db3902ad6182f3e42d2ff30c4fbcbde87d55c0d Mon Sep 17 00:00:00 2001 From: "K. Richard Pixley" Date: Sat, 14 Mar 1992 02:30:18 +0000 Subject: [PATCH] pass MAKEINFO down on info --- gdb/ChangeLog | 16 +++++++++++++ gdb/Makefile.in | 60 +++++++++++++++++++++++++++---------------------- 2 files changed, 49 insertions(+), 27 deletions(-) diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 22fb56fc331..c8fc4047ad6 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,21 @@ +Fri Mar 13 15:51:11 1992 K. Richard Pixley (rich@cygnus.com) + + * Makefile.in: pass MAKEINFO down on info. + Thu Mar 12 11:56:46 1992 Per Bothner (bothner@cygnus.com) + Merged in patches from metin@ibmpa.awdpa.ibm.com (Metin G. + Ozisik) (dated Fri, 6 Mar 92 17:51) for the rs6000. + * minsyms.c, symfile.c: Changes that may be generally + applicable, but are #ifdef IBM6000 for now. + * rs6000-xdep.c: Fixed typo in comment. + * rs6000-tdep.c: Non-substatial changes. + * xoffread.c: The main change here is addition of some + debugging functions. + * xoffexec.c: More changes. + + * xcoffread.c: Fixed two too-few-parameters bugs. + * solib.h, infrun.c, tm-rs6000.h: Add a PID parameter to SOLIB_CREATE_INFERIOR_HOOK macro. diff --git a/gdb/Makefile.in b/gdb/Makefile.in index 079ee293e5a..665d536dc13 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -18,10 +18,13 @@ prefix = /usr/local -bindir = $(prefix)/bin +program_prefix = +exec_prefix = $(prefix) +bindir = $(exec_prefix)/bin +libdir = $(exec_prefix)/lib + datadir = $(prefix)/lib -libdir = $(prefix)/lib -mandir = $(datadir)/man +mandir = $(prefix)/man man1dir = $(mandir)/man1 man2dir = $(mandir)/man2 man3dir = $(mandir)/man3 @@ -31,7 +34,7 @@ man6dir = $(mandir)/man6 man7dir = $(mandir)/man7 man8dir = $(mandir)/man8 man9dir = $(mandir)/man9 -infodir = $(datadir)/info +infodir = $(prefix)/info includedir = $(prefix)/include docdir = $(datadir)/doc @@ -49,10 +52,6 @@ RANLIB = ranlib # This can be overridden in the host Makefile fragment file. TERMCAP = -ltermcap -# Host and target-dependent makefile fragments come in here. -#### -# End of host and target-dependent makefile fragments - # 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 @@ -113,13 +112,13 @@ INCLUDE_DEP = $$(INCLUDE_DIR) # (When we want the binary library built from it, we use ${BFD_DIR}${subdir}.) BFD_DIR = ${srcdir}/../bfd BFD_DEP = $$(BFD_DIR) -BFD_LIB = $(unsubdir)/../bfd${subdir}/libbfd.a +BFD_LIB = ./../bfd${subdir}/libbfd.a # Where is the source dir for the READLINE library? Traditionally in .. or . # (For the binary library built from it, we use ${READLINE_DIR}${subdir}.) READLINE_DIR = ${srcdir}/../readline READLINE_DEP = $$(READLINE_DIR) -RL_LIB = $(unsubdir)/../readline${subdir}/libreadline.a +RL_LIB = ./../readline${subdir}/libreadline.a # All the includes used for CFLAGS and for lint. # -I. for config files. @@ -142,7 +141,7 @@ LDFLAGS = $(CFLAGS) # Where is the "-liberty" library, containing getopt and obstack? LIBIBERTY_DIR = ${srcdir}/../libiberty -LIBIBERTY = $(unsubdir)/../libiberty${subdir}/libiberty.a +LIBIBERTY = ./../libiberty${subdir}/libiberty.a # The config/mh-* file must define REGEX and REGEX1 on USG machines. # If your sysyem is missing alloca(), or, more likely, it's there but @@ -158,12 +157,16 @@ 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.4.3 +VERSION = 4.4.5 DIST=gdb LINT=/usr/5bin/lint LINTFLAGS= -I${BFD_DIR} +# Host and target-dependent makefile fragments come in here. +#### +# End of host and target-dependent makefile fragments + # Source files in the main directory. # Files which are included via a config/* Makefile fragment # should *not* be specified here; they're in "ALLDEPFILES". @@ -290,8 +293,9 @@ YYOBJ = c-exp.tab.o m2-exp.tab.o all: gdb $(MAKE) subdir_do DO=all "DODIRS=$(SUBDIRS)" +check: info: force - $(MAKE) subdir_do DO=info "DODIRS=$(SUBDIRS)" + $(MAKE) subdir_do DO=info "DODIRS=$(SUBDIRS)" "MAKEINFO=$(MAKEINFO)" install-info: force $(MAKE) subdir_do DO=install-info "DODIRS=$(SUBDIRS)" clean-info: force @@ -303,7 +307,8 @@ gdb.z:gdb.1 mv gdb.t.z gdb.z install: gdb - $(INSTALL_PROGRAM) gdb $(bindir)/gdb + $(INSTALL_PROGRAM) gdb $(bindir)/$(program_prefix)gdb + $(INSTALL_DATA) $(srcdir)/gdb.1 $(man1dir)/$(program_prefix)gdb.1 $(M_INSTALL) $(MAKE) subdir_do DO=install "DODIRS=$(SUBDIRS)" @@ -549,14 +554,15 @@ STAGESTUFF=${OBS} ${TSOBS} ${NTSOBS} ${ADD_FILES} init.c init.o version.c gdb subdir_do: force for i in $(DODIRS); do \ - if [ -d $(unsubdir)/$$i ] ; then \ - if (cd $(unsubdir)/$$i$(subdir); \ + if [ -d ./$$i ] ; then \ + if (cd ./$$i; \ $(MAKE) \ "against=$(against)" \ "AR=$(AR)" \ "AR_FLAGS=$(AR_FLAGS)" \ "CC=$(CC)" \ "RANLIB=$(RANLIB)" \ + "MAKEINFO=$(MAKEINFO)" \ "BISON=$(BISON)" $(DO)) ; then true ; \ else exit 1 ; fi ; \ else true ; fi ; \ @@ -607,25 +613,25 @@ force: # Documentation! # GDB QUICK REFERENCE (TeX dvi file, CM fonts) refcard.dvi: $(srcdir)/doc/refcard.tex - ( cd $(unsubdir)/doc; $(MAKE) refcard.dvi ) - mv $(unsubdir)/doc/refcard.dvi . + ( cd ./doc; $(MAKE) refcard.dvi ) + mv ./doc/refcard.dvi . # GDB QUICK REFERENCE (PostScript output, common PS fonts) refcard.ps: $(srcdir)/doc/refcard.tex - ( cd $(unsubdir)/doc; $(MAKE) refcard.ps ) - mv $(unsubdir)/doc/refcard.ps . + ( cd ./doc; $(MAKE) refcard.ps ) + mv ./doc/refcard.ps . # GDB MANUAL: TeX dvi file -gdb.dvi: $(unsubdir)/doc/gdb-all.texi - ( cd $(unsubdir)/doc; $(MAKE) M4=$(M4) gdb.dvi ) - mv $(unsubdir)/doc/gdb.dvi . +gdb.dvi: ./doc/gdb-all.texi + ( cd ./doc; $(MAKE) M4=$(M4) gdb.dvi ) + mv ./doc/gdb.dvi . # GDB MANUAL: info file -gdb.info: $(unsubdir)/doc/gdb-all.texi - ( cd $(unsubdir)/doc; $(MAKE) M4=$(M4) gdb.info ) - mv $(unsubdir)/doc/gdb.info* . +gdb.info: ./doc/gdb-all.texi + ( cd ./doc; $(MAKE) M4=$(M4) gdb.info ) + mv ./doc/gdb.info* . -$(unsubdir)/doc/gdb-all.texi: +./doc/gdb-all.texi: (cd $(srcdir)/doc; $(MAKE) M4=$(M4) gdb-all.texi) # Make copying.c from COPYING