This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]

Re: small patch for install.texi



Here's a preliminary patch (with abbreviated Changelog entry for now).
Comments?  This doesn't do anything with maintainer mode yet.  This is
just the doc move.

2001-05-23  DJ Delorie  <dj@delorie.com>

	* *.texi: Moved to doc/*.texi (install.texi renamed)
	* doc/gcc.texi: Look for install-old.texi now.
	* *.info, *.1: Removed.
	* Makefile.in (*.info, *.dvi, *.1, others): Look in srcdir/doc.
	(*.dvi): Find doc/texinfo.tex before system's one.
	* ch/Makefile.in: Ditto.
	* f/Makefile.in: Ditto.
	* java/Makefile.in: Ditto.

Note that java/Makefile.in puts gcj.dvi in gcc/. but tells make it's
in gcc/java/.

? doc/install-old.texi
? doc/c-tree.texi
? doc/contrib.texi
? doc/cpp.texi
? doc/cppinternals.texi
? doc/extend.texi
? doc/fdl.texi
? doc/gcc.texi
? doc/gcov.texi
? doc/invoke.texi
? doc/md.texi
? doc/objc.texi
? doc/rtl.texi
? doc/texinfo.tex
? doc/tm.texi
Index: Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/Makefile.in,v
retrieving revision 1.667
diff -p -3 -r1.667 Makefile.in
*** Makefile.in	2001/05/22 14:16:58	1.667
--- Makefile.in	2001/05/23 20:56:27
*************** stmp-fixproto: fixhdr.ready fixproto stm
*** 2188,2252 ****
  # Remake the info files.
  
  doc: $(BUILD_INFO) gccbug
! info: $(srcdir)/cpp.info $(srcdir)/gcc.info lang.info $(srcdir)/c-tree.info $(srcdir)/cppinternals.info
  
! $(srcdir)/cpp.info: $(srcdir)/cpp.texi
! 	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o cpp.info cpp.texi
  
! $(srcdir)/gcc.info: $(srcdir)/gcc.texi $(srcdir)/extend.texi $(srcdir)/install.texi \
! 	  $(srcdir)/invoke.texi $(srcdir)/md.texi $(srcdir)/rtl.texi \
! 	  $(srcdir)/tm.texi $(srcdir)/gcov.texi $(srcdir)/contrib.texi \
! 	  $(srcdir)/objc.texi
! 	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o gcc.info gcc.texi
! 
! $(srcdir)/c-tree.info: $(srcdir)/c-tree.texi
! 	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o c-tree.info \
! 		c-tree.texi
! 
! $(srcdir)/cppinternals.info: $(srcdir)/cppinternals.texi
! 	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o cppinternals.info \
! 		cppinternals.texi
  
  dvi: gcc.dvi cpp.dvi lang.dvi
  
  # This works with GNU Make's default rule.
! gcc.dvi: $(srcdir)/gcc.texi $(srcdir)/extend.texi $(srcdir)/install.texi \
! 	 $(srcdir)/invoke.texi $(srcdir)/md.texi $(srcdir)/rtl.texi \
! 	 $(srcdir)/tm.texi $(srcdir)/gcov.texi $(srcdir)/contrib.texi \
! 	 $(srcdir)/objc.texi
! 	TEXINPUTS=${texidir}:$(srcdir):$$TEXINPUTS tex gcc.texi
  	texindex gcc.??
! 	TEXINPUTS=${texidir}:$(srcdir):$$TEXINPUTS tex gcc.texi
  
! cpp.dvi: $(srcdir)/cpp.texi
! 	TEXINPUTS=${texidir}:$(srcdir):$$TEXINPUTS tex cpp.texi
  	texindex cpp.??
! 	TEXINPUTS=${texidir}:$(srcdir):$$TEXINPUTS tex cpp.texi
  
! generated-manpages: $(srcdir)/gcov.1 $(srcdir)/cpp.1 $(srcdir)/gcc.1
  
! $(srcdir)/gcov.1: $(srcdir)/gcov.texi
! 	$(STAMP) $(srcdir)/gcov.1
! 	-$(TEXI2POD) < $(srcdir)/gcov.texi > gcov.pod
! 	-($(POD2MAN) gcov.pod > $(srcdir)/gcov.1.T$$$$ && \
! 		mv -f $(srcdir)/gcov.1.T$$$$ $(srcdir)/gcov.1) || \
! 		(rm -f $(srcdir)/gcov.1.T$$$$ && exit 1)
  	-rm -f gcov.pod
  
! $(srcdir)/cpp.1: $(srcdir)/cpp.texi
! 	$(STAMP) $(srcdir)/cpp.1
! 	-$(TEXI2POD) < $(srcdir)/cpp.texi > cpp.pod
! 	-($(POD2MAN) cpp.pod > $(srcdir)/cpp.1.T$$$$ && \
! 		mv -f $(srcdir)/cpp.1.T$$$$ $(srcdir)/cpp.1) || \
! 		(rm -f $(srcdir)/cpp.1.T$$$$ && exit 1)
  	-rm -f cpp.pod
  
! $(srcdir)/gcc.1: $(srcdir)/invoke.texi
! 	$(STAMP) $(srcdir)/gcc.1
! 	-$(TEXI2POD) < $(srcdir)/invoke.texi > gcc.pod
! 	-($(POD2MAN) gcc.pod > $(srcdir)/gcc.1.T$$$$ && \
! 		mv -f $(srcdir)/gcc.1.T$$$$ $(srcdir)/gcc.1) || \
! 		(rm -f $(srcdir)/gcc.1.T$$$$ && exit 1)
  	-rm -f gcc.pod
  
  #
--- 2188,2254 ----
  # Remake the info files.
  
  doc: $(BUILD_INFO) gccbug
! info: $(srcdir)/doc/cpp.info $(srcdir)/doc/gcc.info lang.info $(srcdir)/doc/c-tree.info $(srcdir)/doc/cppinternals.info
  
! docdir = $(srcdir)/doc
  
! $(docdir)/cpp.info: $(docdir)/cpp.texi
! 	cd $(docdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -Idoc -o cpp.info cpp.texi
  
+ $(docdir)/gcc.info: $(docdir)/gcc.texi $(docdir)/extend.texi $(docdir)/install.texi \
+ 	  $(docdir)/invoke.texi $(docdir)/md.texi $(docdir)/rtl.texi \
+ 	  $(docdir)/tm.texi $(docdir)/gcov.texi $(docdir)/contrib.texi \
+ 	  $(docdir)/objc.texi
+ 	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -Idoc -o doc/gcc.info doc/gcc.texi
+ 
+ $(docdir)/c-tree.info: $(docdir)/c-tree.texi
+ 	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -Idoc -o doc/c-tree.info \
+ 		doc/c-tree.texi
+ 
+ $(docdir)/cppinternals.info: $(docdir)/cppinternals.texi
+ 	cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -Idoc -o doc/cppinternals.info \
+ 		doc/cppinternals.texi
+ 
  dvi: gcc.dvi cpp.dvi lang.dvi
  
  # This works with GNU Make's default rule.
! gcc.dvi: $(docdir)/gcc.texi $(docdir)/extend.texi $(docdir)/install.texi \
! 	 $(docdir)/invoke.texi $(docdir)/md.texi $(docdir)/rtl.texi \
! 	 $(docdir)/tm.texi $(docdir)/gcov.texi $(docdir)/contrib.texi \
! 	 $(docdir)/objc.texi
! 	TEXINPUTS=$(docdir):${texidir}:$$TEXINPUTS tex gcc.texi
  	texindex gcc.??
! 	TEXINPUTS=$(docdir):${texidir}:$$TEXINPUTS tex gcc.texi
  
! cpp.dvi: $(docdir)/cpp.texi
! 	TEXINPUTS=${texidir}:$(docdir):$$TEXINPUTS tex cpp.texi
  	texindex cpp.??
! 	TEXINPUTS=${texidir}:$(docdir):$$TEXINPUTS tex cpp.texi
  
! generated-manpages: $(docdir)/gcov.1 $(docdir)/cpp.1 $(docdir)/gcc.1
  
! $(docdir)/gcov.1: $(docdir)/gcov.texi
! 	$(STAMP) $(docdir)/gcov.1
! 	-$(TEXI2POD) < $(docdir)/gcov.texi > gcov.pod
! 	-($(POD2MAN) gcov.pod > $(docdir)/gcov.1.T$$$$ && \
! 		mv -f $(docdir)/gcov.1.T$$$$ $(docdir)/gcov.1) || \
! 		(rm -f $(docdir)/gcov.1.T$$$$ && exit 1)
  	-rm -f gcov.pod
  
! $(docdir)/cpp.1: $(docdir)/cpp.texi
! 	$(STAMP) $(docdir)/cpp.1
! 	-$(TEXI2POD) < $(docdir)/cpp.texi > cpp.pod
! 	-($(POD2MAN) cpp.pod > $(docdir)/cpp.1.T$$$$ && \
! 		mv -f $(docdir)/cpp.1.T$$$$ $(docdir)/cpp.1) || \
! 		(rm -f $(docdir)/cpp.1.T$$$$ && exit 1)
  	-rm -f cpp.pod
  
! $(docdir)/gcc.1: $(docdir)/invoke.texi
! 	$(STAMP) $(docdir)/gcc.1
! 	-$(TEXI2POD) < $(docdir)/invoke.texi > gcc.pod
! 	-($(POD2MAN) gcc.pod > $(docdir)/gcc.1.T$$$$ && \
! 		mv -f $(docdir)/gcc.1.T$$$$ $(docdir)/gcc.1) || \
! 		(rm -f $(docdir)/gcc.1.T$$$$ && exit 1)
  	-rm -f gcc.pod
  
  #
*************** maintainer-clean:
*** 2375,2383 ****
  	-rm -f c-parse.y c-parse.c c-parse.output TAGS
  	-rm -f cpp.??s cpp.*aux
  	-rm -f gcc.??s gcc.*aux
! 	-rm -f $(srcdir)/cpp.info* $(srcdir)/gcc.info* $(srcdir)/c-tree.info*
! 	-rm -f $(srcdir)/cppinternals.info*
! 	-rm -f $(srcdir)/gcov.1 $(srcdir)/cpp.1 $(srcdir)/gcc.1
  #
  # Entry points `install' and `uninstall'.
  # Also use `install-collect2' to install collect2 when the config files don't.
--- 2377,2385 ----
  	-rm -f c-parse.y c-parse.c c-parse.output TAGS
  	-rm -f cpp.??s cpp.*aux
  	-rm -f gcc.??s gcc.*aux
! 	-rm -f $(docdir)/cpp.info* $(docdir)/gcc.info* $(docdir)/c-tree.info*
! 	-rm -f $(docdir)/cppinternals.info*
! 	-rm -f $(docdir)/gcov.1 $(docdir)/cpp.1 $(docdir)/gcc.1
  #
  # Entry points `install' and `uninstall'.
  # Also use `install-collect2' to install collect2 when the config files don't.
*************** install-driver: installdirs xgcc$(exeext
*** 2548,2556 ****
  install-info: doc installdirs lang.install-info
  	-rm -f $(infodir)/cpp.info* $(infodir)/gcc.info*
  	-rm -f $(infodir)/c-tree.info* $(infodir)/cppinternals.info*
! 	if [ -f $(srcdir)/gcc.info ]; then \
! 	  for f in $(srcdir)/cpp.info* $(srcdir)/gcc.info* \
! 		$(srcdir)/c-tree.info* $(srcdir)/cppinternals.info*; do \
  	    realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
  	    $(INSTALL_DATA) $$f $(infodir)/$$realfile; \
  	  done; \
--- 2550,2558 ----
  install-info: doc installdirs lang.install-info
  	-rm -f $(infodir)/cpp.info* $(infodir)/gcc.info*
  	-rm -f $(infodir)/c-tree.info* $(infodir)/cppinternals.info*
! 	if [ -f $(docdir)/gcc.info ]; then \
! 	  for f in $(docdir)/cpp.info* $(docdir)/gcc.info* \
! 		$(docdir)/c-tree.info* $(docdir)/cppinternals.info*; do \
  	    realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
  	    $(INSTALL_DATA) $$f $(infodir)/$$realfile; \
  	  done; \
*************** install-info: doc installdirs lang.insta
*** 2571,2588 ****
  install-man: installdirs $(GENERATED_MANPAGES) lang.install-man
  	-if [ -f gcc-cross$(exeext) ] ; then \
  	  rm -f $(man1dir)/$(GCC_CROSS_NAME)$(manext); \
! 	  $(INSTALL_DATA) $(srcdir)/gcc.1 $(man1dir)/$(GCC_CROSS_NAME)$(manext); \
  	  chmod a-x $(man1dir)/$(GCC_CROSS_NAME)$(manext); \
  	else \
  	  rm -f $(man1dir)/$(GCC_INSTALL_NAME)$(manext); \
! 	  $(INSTALL_DATA) $(srcdir)/gcc.1 $(man1dir)/$(GCC_INSTALL_NAME)$(manext); \
  	  chmod a-x $(man1dir)/$(GCC_INSTALL_NAME)$(manext); \
  	fi
  	-rm -f $(man1dir)/cpp$(manext)
! 	-$(INSTALL_DATA) $(srcdir)/cpp.1 $(man1dir)/cpp$(manext)
  	-chmod a-x $(man1dir)/cpp$(manext)
  	-rm -f $(man1dir)/gcov$(manext)
! 	-$(INSTALL_DATA) $(srcdir)/gcov.1 $(man1dir)/gcov$(manext)
  	-chmod a-x $(man1dir)/gcov$(manext)
  
  # Install the library.
--- 2573,2590 ----
  install-man: installdirs $(GENERATED_MANPAGES) lang.install-man
  	-if [ -f gcc-cross$(exeext) ] ; then \
  	  rm -f $(man1dir)/$(GCC_CROSS_NAME)$(manext); \
! 	  $(INSTALL_DATA) $(docdir)/gcc.1 $(man1dir)/$(GCC_CROSS_NAME)$(manext); \
  	  chmod a-x $(man1dir)/$(GCC_CROSS_NAME)$(manext); \
  	else \
  	  rm -f $(man1dir)/$(GCC_INSTALL_NAME)$(manext); \
! 	  $(INSTALL_DATA) $(docdir)/gcc.1 $(man1dir)/$(GCC_INSTALL_NAME)$(manext); \
  	  chmod a-x $(man1dir)/$(GCC_INSTALL_NAME)$(manext); \
  	fi
  	-rm -f $(man1dir)/cpp$(manext)
! 	-$(INSTALL_DATA) $(docdir)/cpp.1 $(man1dir)/cpp$(manext)
  	-chmod a-x $(man1dir)/cpp$(manext)
  	-rm -f $(man1dir)/gcov$(manext)
! 	-$(INSTALL_DATA) $(docdir)/gcov.1 $(man1dir)/gcov$(manext)
  	-chmod a-x $(man1dir)/gcov$(manext)
  
  # Install the library.
Index: ch/Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ch/Make-lang.in,v
retrieving revision 1.21
diff -p -3 -r1.21 Make-lang.in
*** Make-lang.in	2001/05/20 13:50:43	1.21
--- Make-lang.in	2001/05/23 20:56:28
***************
*** 1,5 ****
  # Top level Makefile fragment for GNU CHILL.
! #   Copyright (C) 1994, 1998, 2000 Free Software Foundation, Inc.
  
  #This file is part of GNU CC.
  
--- 1,5 ----
  # Top level Makefile fragment for GNU CHILL.
! #   Copyright (C) 1994, 1998, 2000, 2001 Free Software Foundation, Inc.
  
  #This file is part of GNU CC.
  
*************** $(srcdir)/ch/chill.info: $(srcdir)/ch/ch
*** 114,122 ****
  	cd $(srcdir)/ch && $(MAKEINFO) -o chill.info chill.texi
  
  chill.dvi: $(srcdir)/ch/chill.texi
! 	TEXINPUTS=${texidir}:$(srcdir)/ch:$(srcdir):$$TEXINPUTS tex $(srcdir)/ch/chill.texi ; \
  	texindex chill.?? ; \
! 	TEXINPUTS=${texidir}:$(srcdir)/ch:$(srcdir)$$TEXINPUTS tex $(srcdir)/ch/chill.texi
  #
  # Install hooks:
  # cc1chill is installed elsewhere as part of $(COMPILERS).
--- 114,122 ----
  	cd $(srcdir)/ch && $(MAKEINFO) -o chill.info chill.texi
  
  chill.dvi: $(srcdir)/ch/chill.texi
! 	TEXINPUTS=$(srcdir)/doc:${texidir}:$(srcdir)/ch:$$TEXINPUTS tex $(srcdir)/ch/chill.texi ; \
  	texindex chill.?? ; \
! 	TEXINPUTS=$(srcdir)/doc:${texidir}:$(srcdir)/ch:$$TEXINPUTS tex $(srcdir)/ch/chill.texi
  #
  # Install hooks:
  # cc1chill is installed elsewhere as part of $(COMPILERS).
Index: f/Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/f/Make-lang.in,v
retrieving revision 1.81
diff -p -3 -r1.81 Make-lang.in
*** Make-lang.in	2001/05/20 13:50:44	1.81
--- Make-lang.in	2001/05/23 20:56:31
*************** $(srcdir)/f/g77.info: $(srcdir)/f/g77.te
*** 179,185 ****
  	esac
  	if [ -f lang-f77 ] && [ x$(BUILD_INFO) = xinfo ]; then \
  	  rm -f $(srcdir)/f/g77.info-*; \
! 	  cd $(srcdir)/f && $(MAKEINFO) -I.. -o g77.info g77.texi; \
  	else true; fi
  
  f/g77.dvi: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
--- 179,185 ----
  	esac
  	if [ -f lang-f77 ] && [ x$(BUILD_INFO) = xinfo ]; then \
  	  rm -f $(srcdir)/f/g77.info-*; \
! 	  cd $(srcdir)/f && $(MAKEINFO) -I../doc -o g77.info g77.texi; \
  	else true; fi
  
  f/g77.dvi: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
*************** f/g77.dvi: $(srcdir)/f/g77.texi $(srcdir
*** 195,203 ****
  # be universally valid.  `$(TEX)' should be used if it gets defined in
  # gcc/Makefile.in.
  	if [ -f lang-f77 ]; then \
! 	  TEXINPUTS=$(srcdir)/f:$(srcdir):$$TEXINPUTS tex $(srcdir)/f/g77.texi; \
  	  texindex g77.??; \
! 	  TEXINPUTS=$(srcdir)/f:$(srcdir):$$TEXINPUTS tex $(srcdir)/f/g77.texi; \
  	  mv g77.dvi f; \
  	else true; fi
  
--- 195,203 ----
  # be universally valid.  `$(TEX)' should be used if it gets defined in
  # gcc/Makefile.in.
  	if [ -f lang-f77 ]; then \
! 	  TEXINPUTS=$(srcdir)/f:$(srcdir)/doc:$$TEXINPUTS tex $(srcdir)/f/g77.texi; \
  	  texindex g77.??; \
! 	  TEXINPUTS=$(srcdir)/f:$(srcdir)/doc:$$TEXINPUTS tex $(srcdir)/f/g77.texi; \
  	  mv g77.dvi f; \
  	else true; fi
  
Index: java/Make-lang.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/Make-lang.in,v
retrieving revision 1.60
diff -p -3 -r1.60 Make-lang.in
*** Make-lang.in	2001/05/01 22:21:01	1.60
--- Make-lang.in	2001/05/23 20:56:32
*************** java/jcf-path.o: java/jcf-path.c $(CONFI
*** 296,305 ****
  $(srcdir)/java/gcj.info: $(srcdir)/java/gcj.texi
  	if test "x$(BUILD_INFO)" = xinfo; then \
  	  rm -f $(srcdir)/java/gcc.info*; \
! 	  cd $(srcdir)/java && $(MAKEINFO) -I.. -o gcj.info gcj.texi; \
  	else true; fi
  
  java/gcj.dvi: $(srcdir)/java/gcj.texi
! 	TEXINPUTS=${texidir}:$(srcdir)/java:$(srcdir):$$TEXINPUTS tex gcj.texi
  	texindex gcj.??
! 	TEXINPUTS=${texidir}:$(srcdir)/java:$(srcdir):$$TEXINPUTS tex gcj.texi
--- 296,305 ----
  $(srcdir)/java/gcj.info: $(srcdir)/java/gcj.texi
  	if test "x$(BUILD_INFO)" = xinfo; then \
  	  rm -f $(srcdir)/java/gcc.info*; \
! 	  cd $(srcdir)/java && $(MAKEINFO) -I../doc -o gcj.info gcj.texi; \
  	else true; fi
  
  java/gcj.dvi: $(srcdir)/java/gcj.texi
! 	TEXINPUTS=$(srcdir)/doc:${texidir}:$(srcdir)/java:$$TEXINPUTS tex gcj.texi
  	texindex gcj.??
! 	TEXINPUTS=$(srcdir)/doc:${texidir}:$(srcdir)/java:$$TEXINPUTS tex gcj.texi


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]