* c-tree.texi, contrib.texi, cpp.texi, cppinternals.texi,

extend.texi, fdl.texi, gcov.texi, invoke.texi, md.texi, objc.texi,
rtl.texi, tm.texi, texinfo.tex: Move to doc subdirectory.
* install.texi: Move to doc/install-old.texi.
* gcc.texi: Move to doc, refer to install-old.texi.
* Makefile.in: Reflect move of docs to doc/.
* f/Make-lang.in: Ditto.
* java/Make-lang.in: Ditto.
* doc/.cvsignore: New.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42779 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 90fcd98..08c8578 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,15 @@
+2001-06-01  DJ Delorie  <dj@redhat.com>
+
+       * c-tree.texi, contrib.texi, cpp.texi, cppinternals.texi,
+       extend.texi, fdl.texi, gcov.texi, invoke.texi, md.texi, objc.texi,
+       rtl.texi, tm.texi, texinfo.tex: Move to doc subdirectory.
+       * install.texi: Move to doc/install-old.texi.
+       * gcc.texi: Move to doc, refer to install-old.texi.
+       * Makefile.in: Reflect move of docs to doc/.
+       * f/Make-lang.in: Ditto.
+       * java/Make-lang.in: Ditto.
+       * doc/.cvsignore: New.
+       
 2001-05-31  Jan van Male  <jan.vanmale@fenk.wau.nl>
 
        * invoke.texi: use two spaces between command options, eliminate

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 12e26e3..0c94050 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -2187,61 +2187,63 @@ stmp-fixproto: fixhdr.ready fixproto stmp-int-hdrs
 #\f
 # Remake the info files.
 
+docdir = $(srcdir)/doc
+
 doc: $(BUILD_INFO) gccbug
-info: $(srcdir)/cpp.info $(srcdir)/gcc.info lang.info $(srcdir)/cppinternals.info
+info: $(docdir)/cpp.info $(docdir)/gcc.info lang.info $(docdir)/cppinternals.info
 
-$(srcdir)/cpp.info: $(srcdir)/cpp.texi
-       cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o cpp.info cpp.texi
+$(docdir)/cpp.info: $(docdir)/cpp.texi
+       cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -o doc/cpp.info doc/cpp.texi
 
-$(srcdir)/gcc.info: $(srcdir)/gcc.texi $(srcdir)/extend.texi $(srcdir)/install.texi \
-        $(srcdir)/invoke.texi $(srcdir)/md.texi $(srcdir)/c-tree.texi \
-        $(srcdir)/rtl.texi $(srcdir)/tm.texi $(srcdir)/gcov.texi \
-        $(srcdir)/contrib.texi $(srcdir)/objc.texi $(srcdir)/fdl.texi
-       cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o gcc.info gcc.texi
+$(docdir)/gcc.info: $(docdir)/gcc.texi $(docdir)/extend.texi $(docdir)/install.texi \
+        $(docdir)/invoke.texi $(docdir)/md.texi $(docdir)/c-tree.texi \
+        $(docdir)/rtl.texi $(docdir)/tm.texi $(docdir)/gcov.texi \
+        $(docdir)/contrib.texi $(docdir)/objc.texi $(docdir)/fdl.texi
+       cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -o doc/gcc.info doc/gcc.texi
 
-$(srcdir)/cppinternals.info: $(srcdir)/cppinternals.texi
-       cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -o cppinternals.info \
-               cppinternals.texi
+$(docdir)/cppinternals.info: $(docdir)/cppinternals.texi
+       cd $(srcdir) && $(MAKEINFO) $(MAKEINFOFLAGS) -I doc -o doc/cppinternals.info \
+               doc/cppinternals.texi
 
 dvi: gcc.dvi cpp.dvi lang.dvi cppinternals.dvi
 
 # This works with GNU Make's default rule.
-cpp.dvi: $(srcdir)/cpp.texi
-       $(TEXI2DVI) -I $(srcdir) $(srcdir)/cpp.texi
-
-gcc.dvi: $(srcdir)/gcc.texi $(srcdir)/extend.texi $(srcdir)/install.texi \
-        $(srcdir)/invoke.texi $(srcdir)/md.texi $(srcdir)/c-tree.texi \
-        $(srcdir)/rtl.texi $(srcdir)/tm.texi $(srcdir)/gcov.texi \
-        $(srcdir)/contrib.texi $(srcdir)/objc.texi $(srcdir)/fdl.texi
-       $(TEXI2DVI) -I $(srcdir) $(srcdir)/gcc.texi
-
-cppinternals.dvi: $(srcdir)/cppinternals.texi
-       $(TEXI2DVI) -I $(srcdir) $(srcdir)/cppinternals.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)
+cpp.dvi: $(docdir)/cpp.texi
+       $(TEXI2DVI) -I $(docdir) $(docdir)/cpp.texi
+
+gcc.dvi: $(docdir)/gcc.texi $(docdir)/extend.texi $(docdir)/install.texi \
+        $(docdir)/invoke.texi $(docdir)/md.texi $(docdir)/c-tree.texi \
+        $(docdir)/rtl.texi $(docdir)/tm.texi $(docdir)/gcov.texi \
+        $(docdir)/contrib.texi $(docdir)/objc.texi $(docdir)/fdl.texi
+       $(TEXI2DVI) -I $(docdir) $(docdir)/gcc.texi
+
+cppinternals.dvi: $(docdir)/cppinternals.texi
+       $(TEXI2DVI) -I $(docdir) $(docdir)/cppinternals.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
 
-$(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)
+$(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
 
-$(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)
+$(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
 
 #\f
@@ -2370,9 +2372,9 @@ maintainer-clean:
        -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*
-       -rm -f $(srcdir)/cppinternals.info*
-       -rm -f $(srcdir)/gcov.1 $(srcdir)/cpp.1 $(srcdir)/gcc.1
+       -rm -f $(docdir)/cpp.info* $(docdir)/gcc.info*
+       -rm -f $(docdir)/cppinternals.info*
+       -rm -f $(docdir)/gcov.1 $(docdir)/cpp.1 $(docdir)/gcc.1
 #\f
 # Entry points `install' and `uninstall'.
 # Also use `install-collect2' to install collect2 when the config files don't.
@@ -2543,9 +2545,9 @@ install-driver: installdirs xgcc$(exeext)
 install-info: doc installdirs lang.install-info
        -rm -f $(infodir)/cpp.info* $(infodir)/gcc.info*
        -rm -f $(infodir)/cppinternals.info*
-       if [ -f $(srcdir)/gcc.info ]; then \
-         for f in $(srcdir)/cpp.info* $(srcdir)/gcc.info* \
-               $(srcdir)/cppinternals.info*; do \
+       if [ -f $(docdir)/gcc.info ]; then \
+         for f in $(docdir)/cpp.info* $(docdir)/gcc.info* \
+               $(docdir)/cppinternals.info*; do \
            realfile=`echo $$f | sed -e 's|.*/\([^/]*\)$$|\1|'`; \
            $(INSTALL_DATA) $$f $(infodir)/$$realfile; \
          done; \
@@ -2566,18 +2568,18 @@ install-info: doc installdirs lang.install-info
 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); \
+         $(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) $(srcdir)/gcc.1 $(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) $(srcdir)/cpp.1 $(man1dir)/cpp$(manext)
+       -$(INSTALL_DATA) $(docdir)/cpp.1 $(man1dir)/cpp$(manext)
        -chmod a-x $(man1dir)/cpp$(manext)
        -rm -f $(man1dir)/gcov$(manext)
-       -$(INSTALL_DATA) $(srcdir)/gcov.1 $(man1dir)/gcov$(manext)
+       -$(INSTALL_DATA) $(docdir)/gcov.1 $(man1dir)/gcov$(manext)
        -chmod a-x $(man1dir)/gcov$(manext)
 
 # Install the library.

diff --git a/gcc/doc/.cvsignore b/gcc/doc/.cvsignore
new file mode 100644 (file)
index 0000000..26fdfb2
--- /dev/null
+++ b/gcc/doc/.cvsignore
@@ -0,0 +1,3 @@
+gcc.info*
+cpp.info*
+cppinternals.info*

diff --git a/gcc/c-tree.texi b/gcc/doc/c-tree.texi
similarity index 100%
rename from gcc/c-tree.texi
rename to gcc/doc/c-tree.texi

diff --git a/gcc/contrib.texi b/gcc/doc/contrib.texi
similarity index 100%
rename from gcc/contrib.texi
rename to gcc/doc/contrib.texi

diff --git a/gcc/cpp.1 b/gcc/doc/cpp.1
similarity index 100%
rename from gcc/cpp.1
rename to gcc/doc/cpp.1

diff --git a/gcc/cpp.texi b/gcc/doc/cpp.texi
similarity index 100%
rename from gcc/cpp.texi
rename to gcc/doc/cpp.texi

diff --git a/gcc/cppinternals.texi b/gcc/doc/cppinternals.texi
similarity index 100%
rename from gcc/cppinternals.texi
rename to gcc/doc/cppinternals.texi

diff --git a/gcc/extend.texi b/gcc/doc/extend.texi
similarity index 100%
rename from gcc/extend.texi
rename to gcc/doc/extend.texi

diff --git a/gcc/fdl.texi b/gcc/doc/fdl.texi
similarity index 100%
rename from gcc/fdl.texi
rename to gcc/doc/fdl.texi

diff --git a/gcc/gcc.1 b/gcc/doc/gcc.1
similarity index 100%
rename from gcc/gcc.1
rename to gcc/doc/gcc.1

diff --git a/gcc/gcc.texi b/gcc/doc/gcc.texi
similarity index 99%
rename from gcc/gcc.texi
rename to gcc/doc/gcc.texi
index b618737..fe570e8 100644 (file)
--- a/gcc/gcc.texi
+++ b/gcc/doc/gcc.texi
@@ -486,7 +486,7 @@ for details of the CHILL standard.
 
 @include invoke.texi
 
-@include install.texi
+@include install-old.texi
 
 @include extend.texi
 

diff --git a/gcc/gcov.1 b/gcc/doc/gcov.1
similarity index 100%
rename from gcc/gcov.1
rename to gcc/doc/gcov.1

diff --git a/gcc/gcov.texi b/gcc/doc/gcov.texi
similarity index 100%
rename from gcc/gcov.texi
rename to gcc/doc/gcov.texi

diff --git a/gcc/install.texi b/gcc/doc/install-old.texi
similarity index 100%
rename from gcc/install.texi
rename to gcc/doc/install-old.texi

diff --git a/gcc/invoke.texi b/gcc/doc/invoke.texi
similarity index 100%
rename from gcc/invoke.texi
rename to gcc/doc/invoke.texi

diff --git a/gcc/md.texi b/gcc/doc/md.texi
similarity index 100%
rename from gcc/md.texi
rename to gcc/doc/md.texi

diff --git a/gcc/objc.texi b/gcc/doc/objc.texi
similarity index 100%
rename from gcc/objc.texi
rename to gcc/doc/objc.texi

diff --git a/gcc/rtl.texi b/gcc/doc/rtl.texi
similarity index 100%
rename from gcc/rtl.texi
rename to gcc/doc/rtl.texi

diff --git a/gcc/texinfo.tex b/gcc/doc/texinfo.tex
similarity index 100%
rename from gcc/texinfo.tex
rename to gcc/doc/texinfo.tex

diff --git a/gcc/tm.texi b/gcc/doc/tm.texi
similarity index 100%
rename from gcc/tm.texi
rename to gcc/doc/tm.texi

diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index 6fadb43..798bb26 100644 (file)
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -172,27 +172,27 @@ f77.dvi: f/g77.dvi
 $(srcdir)/f/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
                $(srcdir)/f/ffe.texi $(srcdir)/f/g77install.texi \
                $(srcdir)/f/news.texi  $(srcdir)/f/intdoc.texi \
-               $(srcdir)/f/root.texi $(srcdir)/fdl.texi
+               $(srcdir)/f/root.texi $(srcdir)/doc/fdl.texi
        case "$(LANGUAGES)" in \
          *[fF]77*) $(STAMP) lang-f77;; \
          *) rm -f lang-f77;; \
        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; \
+         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 \
                $(srcdir)/f/ffe.texi $(srcdir)/f/g77install.texi \
                $(srcdir)/f/news.texi  $(srcdir)/f/intdoc.texi \
-               $(srcdir)/f/root.texi $(srcdir)/fdl.texi
+               $(srcdir)/f/root.texi $(srcdir)/doc/fdl.texi
        case "$(LANGUAGES)" in \
          *[fF]77*) $(STAMP) lang-f77;; \
          *) rm -f lang-f77;; \
        esac
        if [ -f lang-f77 ]; then \
          s=`cd $(srcdir); pwd`; export s; \
-         cd f && $(TEXI2DVI) -I $$s $$s/f/g77.texi; \
+         cd f && $(TEXI2DVI) -I $$s/doc $$s/f/g77.texi; \
        else true; fi
 
 # This dance is all about producing accurate documentation for g77's

diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 2737f93..0cae9b2 100644 (file)
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -293,12 +293,12 @@ java/jcf-path.o: java/jcf-path.c $(CONFIG_H) $(SYSTEM_H) java/jcf.h
          $(srcdir)/java/jcf-path.c $(OUTPUT_OPTION)
 
 # Documentation
-$(srcdir)/java/gcj.info: $(srcdir)/java/gcj.texi $(srcdir)/fdl.texi
+$(srcdir)/java/gcj.info: $(srcdir)/java/gcj.texi $(srcdir)/doc/fdl.texi
        if test "x$(BUILD_INFO)" = xinfo; then \
          rm -f $(srcdir)/java/gcc.info*; \
-         cd $(srcdir)/java && $(MAKEINFO) -I.. -o gcj.info gcj.texi; \
+         cd $(srcdir)/java && $(MAKEINFO) -I../doc -o gcj.info gcj.texi; \
        else true; fi
 
-java/gcj.dvi: $(srcdir)/java/gcj.texi $(srcdir)/fdl.texi
+java/gcj.dvi: $(srcdir)/java/gcj.texi $(srcdir)/doc/fdl.texi
        s=`cd $(srcdir); pwd`; export s; \
-       cd java && $(TEXI2DVI) -I $$s $$s/java/gcj.texi
+       cd java && $(TEXI2DVI) -I $$s/doc $$s/java/gcj.texi