diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6ea200f754b..853c61fc63f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,27 @@
+2004-01-20  Kelley Cook  <kcook@gcc.gnu.org>
+
+	PR bootstrap/12730
+	* configure.ac: Delete definition and subsitution of docdir.
+	Add info, man, srcman and srcinfo to target hooks. Create doc/
+	directory.
+	* configure: Regenerate.
+	* Makefile.in: Don't substitute docdir and delete all references
+	throughout.
+	(MAKEINFOFLAGS): Define.
+	(stmp-docobjdir): Delete.
+	(INFOFILES, MANFILES): Define.
+	(info): Call lang.info, srcinfo and lang.srcinfo.
+	(generated-manpages): Call lang.man, srcman and lang.srcman.
+	(srcinfo, srcman): New rules to copy back files to source directory.
+	(doc/%.info, doc/%.dvi, doc/%.1, doc/%.7): New implict rule.
+	(install-man): Revamp rule.
+	(clean): Update dvi directory.
+	(distclean): Delete TAGS from front end directorys.
+	(maintainer-clean): Delete all document files in source directory.
+
+	objc/Make-lang.in (objc.man, objc.info): Dummy entries.
+	(objc.srcman, objc.srcinfo): Likewise.
+
 2004-01-20  Bruce Korb  <bkorb@gnu.org>
 
 	* fixinc/inclhack.def(math_exception): bypass only for glibc.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 7ebe77f2c32..ec1fb5ef341 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -71,7 +71,6 @@ program_transform_name := @program_transform_name@
 
 # Directory where sources are, from where we are.
 srcdir = @srcdir@
-docobjdir = @docobjdir@
 docdir = $(srcdir)/doc
 
 # Top build directory, relative to here.
@@ -235,7 +234,7 @@ INSTALL_PROGRAM = @INSTALL_PROGRAM@
 INSTALL_DATA = @INSTALL_DATA@
 INSTALL_SCRIPT = @INSTALL@
 MAKEINFO = @MAKEINFO@
-MAKEINFOFLAGS =
+MAKEINFOFLAGS = --no-split
 TEXI2DVI = texi2dvi
 TEXI2POD = perl $(srcdir)/../contrib/texi2pod.pl
 POD2MAN = pod2man --center="GNU" --release="gcc-$(version)"
@@ -2611,13 +2610,15 @@ stmp-fixproto: fixhdr.ready fixproto stmp-int-hdrs
 #
 # Remake the info files.
 
-stmp-docobjdir:
-	-test -d $(docobjdir) || mkdir $(docobjdir)
-	$(STAMP) stmp-docobjdir
-
 doc: $(BUILD_INFO) $(GENERATED_MANPAGES) gccbug
-info:: $(docobjdir)/cpp.info $(docobjdir)/gcc.info $(docobjdir)/gccint.info \
-	 $(docobjdir)/gccinstall.info $(docobjdir)/cppinternals.info
+
+INFOFILES = doc/cpp.info doc/gcc.info doc/gccint.info \
+            doc/gccinstall.info doc/cppinternals.info
+
+info: $(INFOFILES) lang.info @GENINSRC@ srcinfo lang.srcinfo
+
+srcinfo: $(INFOFILES)
+	-cp -p $^ $(srcdir)/doc
 
 TEXI_CPP_FILES = cpp.texi fdl.texi cppenv.texi cppopts.texi
 
@@ -2641,51 +2642,53 @@ TEXI_CPPINT_FILES = cppinternals.texi
 # patterns.   To use them, put each of the specific target with with their 
 # specific dependencies but no build commands.
 
-$(docobjdir)/cpp.info: $(TEXI_CPP_FILES)
-$(docobjdir)/gcc.info: $(TEXI_GCC_FILES)
-$(docobjdir)/gccint.info: $(TEXI_GCCINT_FILES)
-$(docobjdir)/cppinternals.info: $(TEXI_CPPINT_FILES)
+doc/cpp.info: $(TEXI_CPP_FILES)
+doc/gcc.info: $(TEXI_GCC_FILES)
+doc/gccint.info: $(TEXI_GCCINT_FILES)
+doc/cppinternals.info: $(TEXI_CPPINT_FILES)
 
-$(docobjdir)/%.info: %.texi stmp-docobjdir
+doc/%.info: %.texi
 	if [ x$(BUILD_INFO) = xinfo ]; then \
 		$(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) \
 			-I $(docdir)/include -o $@ $<; \
 	fi
 
 # Duplicate entry to handle renaming of gccinstall.info
-$(docobjdir)/gccinstall.info: $(TEXI_GCCINSTALL_FILES) stmp-docobjdir
+doc/gccinstall.info: $(TEXI_GCCINSTALL_FILES)
 	if [ x$(BUILD_INFO) = xinfo ]; then \
 		$(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir) \
 			-I $(docdir)/include -o $@ $<; \
 	fi
 
-$(docobjdir)/cpp.dvi: $(TEXI_CPP_FILES)
-$(docobjdir)/gcc.dvi: $(TEXI_GCC_FILES)
-$(docobjdir)/gccint.dvi: $(TEXI_GCCINT_FILES)
-$(docobjdir)/cppinternals.dvi: $(TEXI_CPPINT_FILES)
+doc/cpp.dvi: $(TEXI_CPP_FILES)
+doc/gcc.dvi: $(TEXI_GCC_FILES)
+doc/gccint.dvi: $(TEXI_GCCINT_FILES)
+doc/cppinternals.dvi: $(TEXI_CPPINT_FILES)
 
-dvi:: $(docobjdir)/gcc.dvi $(docobjdir)/gccint.dvi \
-      $(docobjdir)/gccinstall.dvi $(docobjdir)/cpp.dvi \
-      $(docobjdir)/cppinternals.dvi
+dvi:: doc/gcc.dvi doc/gccint.dvi doc/gccinstall.dvi doc/cpp.dvi \
+      doc/cppinternals.dvi
 
-$(docobjdir)/%.dvi: %.texi stmp-docobjdir
+doc/%.dvi: %.texi
 	$(TEXI2DVI) -I $(docdir) -I $(docdir)/include -o $@ $<
 
 # Duplicate entry to handle renaming of gccinstall.dvi
-$(docobjdir)/gccinstall.dvi: $(TEXI_GCCINSTALL_FILES) stmp-docobjdir
+doc/gccinstall.dvi: $(TEXI_GCCINSTALL_FILES)
 	$(TEXI2DVI) -I $(docdir) -I $(docdir)/include -o $@ $<
 
-generated-manpages:: $(docobjdir)/gcov.1 $(docobjdir)/cpp.1 \
-	$(docobjdir)/gcc.1 $(docobjdir)/gfdl.7 $(docobjdir)/gpl.7 \
-	$(docobjdir)/fsf-funding.7
+MANFILES = doc/gcov.1 doc/cpp.1 doc/gcc.1 doc/gfdl.7 doc/gpl.7 doc/fsf-funding.7
 
-$(docobjdir)/%.1: %.pod stmp-docobjdir
+generated-manpages: $(MANFILES) lang.man @GENINSRC@ srcman lang.srcman
+
+srcman: $(MANFILES)
+	-cp -p $^ $(srcdir)/doc
+
+doc/%.1: %.pod
 	$(STAMP) $@
 	-($(POD2MAN) --section=1 $< > $(@).T$$$$ && \
 		mv -f $(@).T$$$$ $@) || \
 		(rm -f $(@).T$$$$ && exit 1)
 
-$(docobjdir)/%.7: %.pod stmp-docobjdir
+doc/%.7: %.pod
 	$(STAMP) $@
 	-($(POD2MAN) --section=7 $< > $(@).T$$$$ && \
 		mv -f $(@).T$$$$ $@) || \
@@ -2773,8 +2776,7 @@ clean: mostlyclean lang.clean
 	-rm -f config.h tconfig.h bconfig.h tm_p.h tm.h
 	-rm -f cs-*
 	-rm -rf libgcc
-	-rm -f *.dvi
-	-rm -f */*.dvi
+	-rm -f doc/*.dvi
 # Delete the include directory.
 	-rm -rf include
 # Delete files used by the "multilib" facility (including libgcc subdirs).
@@ -2824,10 +2826,7 @@ maintainer-clean:
 	-rm -f $(srcdir)/c-parse.y $(srcdir)/c-parse.c
 	-rm -f cpp.??s cpp.*aux
 	-rm -f gcc.??s gcc.*aux
-	-rm -f $(docobjdir)/cpp.info* $(docobjdir)/gcc.info* $(docobjdir)/gccint.info*
-	-rm -f $(docobjdir)/cppinternals.info*
-	-rm -f $(docobjdir)/gcov.1 $(docobjdir)/cpp.1 $(docobjdir)/gcc.1
-	-rm -f $(docobjdir)/fsf-funding.7 $(docobjdir)/gfdl.7 $(docobjdir)/gpl.7
+	-rm -f $(docdir)/*.info $(docdir)/*.1 $(docdir)/*.7 $(docdir)/*.dvi
 #
 # Entry points `install' and `uninstall'.
 # Also use `install-collect2' to install collect2 when the config files don't.
@@ -2937,7 +2936,7 @@ install-info:: doc installdirs \
 	$(DESTDIR)$(infodir)/gccinstall.info \
 	$(DESTDIR)$(infodir)/gccint.info
 
-$(DESTDIR)$(infodir)/%.info: $(docobjdir)/%.info installdirs
+$(DESTDIR)$(infodir)/%.info: doc/%.info installdirs
 	rm -f $@
 	if [ -f $< ]; then \
 	  for f in $(<)*; do \
@@ -2955,25 +2954,28 @@ $(DESTDIR)$(infodir)/%.info: $(docobjdir)/%.info installdirs
 	else true; fi;
 
 # Install the man pages.
-install-man: installdirs $(GENERATED_MANPAGES) lang.install-man
-	-rm -f $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext)
-	-$(INSTALL_DATA) $(docobjdir)/gcc.1 $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext)
-	-chmod a-x $(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext)
-	-rm -f $(DESTDIR)$(man1dir)/cpp$(man1ext)
-	-$(INSTALL_DATA) $(docobjdir)/cpp.1 $(DESTDIR)$(man1dir)/cpp$(man1ext)
-	-chmod a-x $(DESTDIR)$(man1dir)/cpp$(man1ext)
-	-rm -f $(DESTDIR)$(man1dir)/gcov$(man1ext)
-	-$(INSTALL_DATA) $(docobjdir)/gcov.1 $(DESTDIR)$(man1dir)/gcov$(man1ext)
-	-chmod a-x $(DESTDIR)$(man1dir)/gcov$(man1ext)
-	-rm -f $(DESTDIR)$(man7dir)/fsf-funding$(man7ext)
-	-$(INSTALL_DATA) $(docobjdir)/fsf-funding.7 $(DESTDIR)$(man7dir)/fsf-funding$(man7ext)
-	-chmod a-x $(DESTDIR)$(man7dir)/fsf-funding$(man7ext)
-	-rm -f $(DESTDIR)$(man7dir)/gfdl$(man7ext)
-	-$(INSTALL_DATA) $(docobjdir)/gfdl.7 $(DESTDIR)$(man7dir)/gfdl$(man7ext)
-	-chmod a-x $(DESTDIR)$(man7dir)/gfdl$(man7ext)
-	-rm -f $(DESTDIR)$(man7dir)/gpl$(man7ext)
-	-$(INSTALL_DATA) $(docobjdir)/gpl.7 $(DESTDIR)$(man7dir)/gpl$(man7ext)
-	-chmod a-x $(DESTDIR)$(man7dir)/gpl$(man7ext)
+install-man: installdirs lang.install-man \
+	$(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext) \
+	$(DESTDIR)$(man1dir)/cpp$(man1ext) \
+	$(DESTDIR)$(man1dir)/gcov$(man1ext) \
+	$(DESTDIR)$(man7dir)/fsf-funding$(man7ext) \
+	$(DESTDIR)$(man7dir)/gfdl$(man7ext) \
+	$(DESTDIR)$(man7dir)/gpl$(man7ext)
+
+$(DESTDIR)$(man1dir)/%$(man1ext): doc/%.1
+	-rm -f $@
+	-$(INSTALL_DATA) $< $@
+	-chmod a-x $@
+
+$(DESTDIR)$(man7dir)/%$(man7ext): doc/%.7
+	-rm -f $@
+	-$(INSTALL_DATA) $< $@
+	-chmod a-x $@
+
+$(DESTDIR)$(man1dir)/$(GCC_INSTALL_NAME)$(man1ext): doc/gcc.1
+	-rm -f $@
+	-$(INSTALL_DATA) $< $@ 
+	-chmod a-x $@
 
 # Install the library.
 install-libgcc: libgcc.mk libgcc.a libgcov.a installdirs
diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog
index ae15e9d0546..2f0642f6bc8 100644
--- a/gcc/ada/ChangeLog
+++ b/gcc/ada/ChangeLog
@@ -1,3 +1,13 @@
+2004-01-20  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* Make-lang.in: Replace $(docdir) with doc.
+	(doc/gnat_ug_unx.info, doc/gnat_ug_vwx.info, doc/gnat_ug_vms.info
+	doc/gnat_ug_wnt.info, doc/gnat_rm.info, doc/gnat-style.info): Update
+	to use consistent MAKEINFO rule.
+	(ada.man, ada.srcman): Dummy entry.
+	(ADA_INFOFILES): Define.
+	(ada.info, ada.srcinfo): New rules.
+
 2004-01-19  Arnaud Charlet  <charlet@act-europe.fr>
 
 	* utils.c: Update copyright notice, missed in previous change.
diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in
index 3c242547e56..b821b2d7932 100644
--- a/gcc/ada/Make-lang.in
+++ b/gcc/ada/Make-lang.in
@@ -432,13 +432,14 @@ ada.all.cross:
 
 ada.start.encap: 
 ada.rest.encap: 
+ada.man:
 ada.srcextra:
+ada.srcman:
 
 ada.tags: force
 	cd $(srcdir)/ada; etags -o TAGS.sub *.c *.h *.ads *.adb; \
 	etags --include TAGS.sub --include ../TAGS.sub
 
-ada.generated-manpages:
 
 # Generate documentation.
 #
@@ -481,39 +482,61 @@ $(srcdir)/ada/gnat_ug_wnt.texi : ada/doctools/xgnatug$(build_exeext) \
 	ada/doctools/xgnatug wnt $(srcdir)/ada/gnat_ug.texi $(srcdir)/ada/ug_words $(srcdir)/ada/gnat_ug_wnt.texi
 endif
 
-$(docobjdir)/gnat_ug_unx.info : $(srcdir)/ada/gnat_ug_unx.texi \
-	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi \
-	stmp-docobjdir
-	$(MAKEINFO) -I $(docdir)/include -I $(srcdir)/ada -o $@ $<
+doc/gnat_ug_unx.info: $(srcdir)/ada/gnat_ug_unx.texi \
+   $(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi
+	if [ x$(BUILD_INFO) = xinfo ]; then \
+	  rm -f $(@)*; \
+	  $(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include \
+            -I$(srcdir)/ada -o $@ $<; \
+	else true; fi
+	
+doc/gnat_ug_vms.info: $(srcdir)/ada/gnat_ug_vms.texi \
+   $(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi
+	if [ x$(BUILD_INFO) = xinfo ]; then \
+	  rm -f $(@)*; \
+	  $(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include \
+            -I$(srcdir)/ada -o $@ $<; \
+	else true; fi
 
-$(docobjdir)/gnat_ug_vms.info : $(srcdir)/ada/gnat_ug_vms.texi \
-	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi \
-	stmp-docobjdir
-	$(MAKEINFO) -I $(docdir)/include -I $(srcdir)/ada -o $@ $<
+doc/gnat_ug_vxw.info: $(srcdir)/ada/gnat_ug_vxw.texi \
+   $(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi
+	if [ x$(BUILD_INFO) = xinfo ]; then \
+	  rm -f $(@)*; \
+	  $(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include \
+            -I$(srcdir)/ada -o $@ $<; \
+	else true; fi
 
-$(docobjdir)/gnat_ug_vxw.info : $(srcdir)/ada/gnat_ug_vxw.texi \
-	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi \
-	stmp-docobjdir
-	$(MAKEINFO) -I $(docdir)/include -I $(srcdir)/ada -o $@ $<
+doc/gnat_ug_wnt.info: $(srcdir)/ada/gnat_ug_wnt.texi \
+   $(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi
+	if [ x$(BUILD_INFO) = xinfo ]; then \
+	  rm -f $(@)*; \
+	  $(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include \
+            -I$(srcdir)/ada -o$@ $<; \
+	else true; fi
 
-$(docobjdir)/gnat_ug_wnt.info : $(srcdir)/ada/gnat_ug_wnt.texi \
-	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi \
-	stmp-docobjdir
-	$(MAKEINFO) -I $(docdir)/include -I $(srcdir)/ada -o $@ $<
+doc/gnat_rm.info: ada/gnat_rm.texi $(docdir)/include/fdl.texi \
+   $(docdir)/include/gcc-common.texi
+	if [ x$(BUILD_INFO) = xinfo ]; then \
+	  rm -f $(@)*; \
+	  $(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include \
+            -I$(srcdir)/ada -o $@ $<; \
+	else true; fi
 
-$(docobjdir)/gnat_rm.info : $(srcdir)/ada/gnat_rm.texi \
-	$(srcdir)/doc/include/fdl.texi $(srcdir)/doc/include/gcc-common.texi \
-	stmp-docobjdir
-	$(MAKEINFO) -I $(docdir)/include -I $(srcdir)/ada -o $@ $<
+doc/gnat-style.info: ada/gnat-style.texi $(docdir)/include/fdl.texi
+	if [ x$(BUILD_INFO) = xinfo ]; then \
+	  rm -f $(@)*; \
+	  $(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include \
+            -I$(srcdir)/ada -o $@ $<; \
+	else true; fi
 
-$(docobjdir)/gnat-style.info : $(srcdir)/ada/gnat-style.texi \
-	$(srcdir)/doc/include/fdl.texi \
-	stmp-docobjdir
-	$(MAKEINFO) -I $(docdir)/include -I $(srcdir)/ada -o $@ $<
+ADA_INFOFILES = doc/gnat_ug_vms.info doc/gnat_ug_wnt.info \
+                doc/gnat_ug_unx.info doc/gnat_ug_vxw.info \
+                doc/gnat_rm.info doc/gnat-style.info
 
-info:: $(docobjdir)/gnat_ug_vms.info $(docobjdir)/gnat_ug_wnt.info \
-	$(docobjdir)/gnat_ug_unx.info $(docobjdir)/gnat_ug_vxw.info \
-	$(docobjdir)/gnat_rm.info $(docobjdir)/gnat-style.info
+ada.info: $(ADA_INFOFILES)
+
+ada.srcinfo: $(ADA_INFOFILES)
+	-cp -p $^ $(srcdir)/doc
 
 install-info:: $(DESTDIR)$(infodir)/gnat_ug_vms.info \
 	$(DESTDIR)$(infodir)/gnat_ug_wnt.info \
@@ -522,37 +545,30 @@ install-info:: $(DESTDIR)$(infodir)/gnat_ug_vms.info \
 	$(DESTDIR)$(infodir)/gnat_rm.info \
 	$(DESTDIR)$(infodir)/gnat-style.info
 
-dvi:: $(docobjdir)/gnat_ug_vms.dvi $(docobjdir)/gnat_ug_wnt.dvi \
-	$(docobjdir)/gnat_ug_unx.dvi $(docobjdir)/gnat_ug_vxw.dvi \
-	$(docobjdir)/gnat_rm.dvi $(docobjdir)/gnat-style.dvi
+dvi:: doc/gnat_ug_vms.dvi doc/gnat_ug_wnt.dvi doc/gnat_ug_unx.dvi \
+      doc/gnat_ug_vxw.dvi doc/gnat_rm.dvi doc/gnat-style.dvi
 
-$(docobjdir)/gnat_ug_unx.dvi: ada/gnat_ug_unx.texi \
-	$(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi \
-	stmp-docobjdir
+doc/gnat_ug_unx.dvi: $(srcdir)/ada/gnat_ug_unx.texi \
+	$(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi
 	$(TEXI2DVI) -c -I $(docdir)/include -o $@ $<
 
-$(docobjdir)/gnat_ug_vms.dvi: ada/gnat_ug_vms.texi \
-	$(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi \
-	stmp-docobjdir
+doc/gnat_ug_vms.dvi: $(srcdir)/ada/gnat_ug_vms.texi \
+	$(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi
 	$(TEXI2DVI) -c -I $(docdir)/include -o $@ $<
 
-$(docobjdir)/gnat_ug_vxw.dvi: ada/gnat_ug_vxw.texi \
-	$(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi \
-	stmp-docobjdir
+doc/gnat_ug_vxw.dvi: $(srcdir)/ada/gnat_ug_vxw.texi \
+	$(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi
 	$(TEXI2DVI) -c -I $(docdir)/include -o $@ $<
 
-$(docobjdir)/gnat_ug_wnt.dvi: ada/gnat_ug_wnt.texi \
-	$(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi \
-	stmp-docobjdir
+doc/gnat_ug_wnt.dvi: $(srcdir)/ada/gnat_ug_wnt.texi \
+	$(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi
 	$(TEXI2DVI) -c -I $(docdir)/include -o $@ $<
 
-$(docobjdir)/gnat_rm.dvi: ada/gnat_rm.texi \
-	$(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi \
-	stmp-docobjdir
+doc/gnat_rm.dvi: ada/gnat_rm.texi \
+	$(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi
 	$(TEXI2DVI) -c -I $(docdir)/include -o $@ $<
 
-$(docobjdir)/gnat-style.dvi: ada/gnat-style.texi $(docdir)/include/fdl.texi \
-	stmp-docobjdir
+doc/gnat-style.dvi: ada/gnat-style.texi $(docdir)/include/fdl.texi
 	$(TEXI2DVI) -c -I $(docdir)/include -o $@ $<
 
 
diff --git a/gcc/configure b/gcc/configure
index 73108e5c018..476538533e1 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -308,7 +308,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP GNATBIND ac_ct_GNATBIND strict1_warn warn_cflags WERROR nocommon_flag EGREP valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep SET_MAKE AWK LN LN_S RANLIB ac_ct_RANLIB INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON stage1_cflags COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LIBICONV_DEP manext objext extra_modes_file FORBUILD PACKAGE VERSION USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS CROSS ALL SYSTEM_HEADER_DIR inhibit_libc BUILD_PREFIX BUILD_PREFIX_1 CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO libgcc_visibility gthread_flags GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir docobjdir all_boot_languages all_compilers all_gtfiles all_gtfiles_files_langs all_gtfiles_files_files all_lang_makefrags all_lang_makefiles all_languages all_stagestuff build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines check_languages cc_set_by_configure quoted_cc_set_by_configure cpp_install_dir xmake_file tmake_file extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir libstdcxx_incdir gcc_version gcc_version_full gcc_version_trigger host_exeext host_extra_gcc_objs host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file stage_prefix_set_by_configure quoted_stage_prefix_set_by_configure symbolic_link thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines target_noncanonical c_target_objs cxx_target_objs target_cpu_default LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP GNATBIND ac_ct_GNATBIND strict1_warn warn_cflags WERROR nocommon_flag EGREP valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_shared TARGET_SYSTEM_ROOT TARGET_SYSTEM_ROOT_DEFINE CROSS_SYSTEM_HEADER_DIR onestep SET_MAKE AWK LN LN_S RANLIB ac_ct_RANLIB INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON stage1_cflags COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LIBICONV_DEP manext objext extra_modes_file FORBUILD PACKAGE VERSION USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS CROSS ALL SYSTEM_HEADER_DIR inhibit_libc BUILD_PREFIX BUILD_PREFIX_1 CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO libgcc_visibility gthread_flags GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir subdirs srcdir all_boot_languages all_compilers all_gtfiles all_gtfiles_files_langs all_gtfiles_files_files all_lang_makefrags all_lang_makefiles all_languages all_stagestuff build_exeext build_install_headers_dir build_xm_file_list build_xm_include_list build_xm_defines check_languages cc_set_by_configure quoted_cc_set_by_configure cpp_install_dir xmake_file tmake_file extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir libstdcxx_incdir gcc_version gcc_version_full gcc_version_trigger host_exeext host_extra_gcc_objs host_xm_file_list host_xm_include_list host_xm_defines out_host_hook_obj install lang_opt_files lang_specs_files lang_tree_files local_prefix md_file objc_boehm_gc out_file out_object_file stage_prefix_set_by_configure quoted_stage_prefix_set_by_configure symbolic_link thread_file tm_file_list tm_include_list tm_defines tm_p_file_list tm_p_include_list xm_file_list xm_include_list xm_defines target_noncanonical c_target_objs cxx_target_objs target_cpu_default LIBOBJS LTLIBOBJS'
 ac_subst_files='language_hooks'
 
 # Initialize some variables set by options.
@@ -1631,10 +1631,8 @@ echo "${ECHO_T}$generated_files_in_srcdir" >&6
 
 if test "$generated_files_in_srcdir" = "yes"; then
   GENINSRC=''
-  docobjdir='$(srcdir)/doc'
 else
   GENINSRC='#'
-  docobjdir='$(objdir)/doc'
 fi
 
 
@@ -4999,7 +4997,7 @@ if test "${gcc_cv_prog_makeinfo_modern+set}" = set; then
 else
     ac_prog_version=`$MAKEINFO --version 2>&1 |
                    sed -n 's/^.*GNU texinfo.* \([0-9][0-9.]*\).*$/\1/p'`
-  echo "configure:5002: version of makeinfo is $ac_prog_version" >&5
+  echo "configure:5000: version of makeinfo is $ac_prog_version" >&5
   case $ac_prog_version in
     '')     gcc_cv_prog_makeinfo_modern=no;;
     4.[2-9]*)
@@ -11489,7 +11487,7 @@ rm -f Make-hooks
 touch Make-hooks
 target_list="all.build all.cross start.encap rest.encap tags \
 	install-normal install-common install-man \
-	uninstall srcextra \
+	uninstall info man srcextra srcman srcinfo \
 	mostlyclean clean distclean maintainer-clean \
 	stage1 stage2 stage3 stage4 stageprofile stagefeedback"
 for t in $target_list
@@ -11651,6 +11649,13 @@ objdir=`${PWDCMD-pwd}`
 
 
 
+# If it doesn't already exist, create document directory
+echo "checking for the document directory." 1>&2
+if test -d doc ; then
+  true
+else
+  mkdir doc
+fi
 
 # Echo link setup.
 if test x${build} = x${host} ; then
@@ -12405,7 +12410,6 @@ s,@slibdir@,$slibdir,;t t
 s,@objdir@,$objdir,;t t
 s,@subdirs@,$subdirs,;t t
 s,@srcdir@,$srcdir,;t t
-s,@docobjdir@,$docobjdir,;t t
 s,@all_boot_languages@,$all_boot_languages,;t t
 s,@all_compilers@,$all_compilers,;t t
 s,@all_gtfiles@,$all_gtfiles,;t t
diff --git a/gcc/configure.ac b/gcc/configure.ac
index c4c5767180a..28c32206d73 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -171,10 +171,8 @@ AC_MSG_RESULT($generated_files_in_srcdir)
 
 if test "$generated_files_in_srcdir" = "yes"; then
   GENINSRC=''
-  docobjdir='$(srcdir)/doc'
 else
   GENINSRC='#'
-  docobjdir='$(objdir)/doc'
 fi
 AC_SUBST(GENINSRC)
 
@@ -2897,7 +2895,7 @@ rm -f Make-hooks
 touch Make-hooks
 target_list="all.build all.cross start.encap rest.encap tags \
 	install-normal install-common install-man \
-	uninstall srcextra \
+	uninstall info man srcextra srcman srcinfo \
 	mostlyclean clean distclean maintainer-clean \
 	stage1 stage2 stage3 stage4 stageprofile stagefeedback"
 for t in $target_list
@@ -2990,7 +2988,6 @@ AC_SUBST(objdir)
 # Substitute configuration variables
 AC_SUBST(subdirs)
 AC_SUBST(srcdir)
-AC_SUBST(docobjdir)
 AC_SUBST(all_boot_languages)
 AC_SUBST(all_compilers)
 AC_SUBST(all_gtfiles)
@@ -3057,6 +3054,14 @@ AC_SUBST(target_cpu_default)
 
 AC_SUBST_FILE(language_hooks)
 
+# If it doesn't already exist, create document directory
+echo "checking for the document directory." 1>&2
+if test -d doc ; then
+  true
+else
+  mkdir doc 
+fi
+
 # Echo link setup.
 if test x${build} = x${host} ; then
   if test x${host} = x${target} ; then
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 55605d6834c..bfae507284b 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,10 @@
+2004-01-20  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* Make-lang.in: Replace $(docdir) with doc.
+	(c++.info, c++.srcinfo): Dummy entry.
+	(c++.man, c++.srcman): New rules.
+	(c++.install-man): Revamp rule.
+
 2004-01-20  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* Make-lang.in (CXX_INSTALL_NAME, GXX_INSTALL_NAME, 
diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in
index c239e4b7783..41d21ecf499 100644
--- a/gcc/cp/Make-lang.in
+++ b/gcc/cp/Make-lang.in
@@ -108,6 +108,8 @@ c++.all.build: g++$(exeext)
 c++.all.cross: g++-cross$(exeext)
 c++.start.encap: g++$(exeext)
 c++.rest.encap:
+c++.info:
+c++.srcinfo:
 c++.srcextra:
 
 c++.tags: force
@@ -115,7 +117,10 @@ c++.tags: force
 	  --regex='/DEFTREECODE [(]\([A-Z_]+\)/\1/' cp-tree.def; \
 	etags --include TAGS.sub --include ../TAGS.sub
 
-generated-manpages:: $(docobjdir)/g++.1
+c++.man: doc/g++.1
+
+c++.srcman: doc/g++.1
+	-cp -p $^ $(srcdir)/doc
 
 check-c++ : check-g++
 lang_checks += check-g++
@@ -157,15 +162,15 @@ c++.install-common: installdirs
 
 # We can't use links because not everyone supports them, and we can't use
 # .so because Irix 6.5 doesn't support them.  So just copy the manpage.
-$(docobjdir)/g++.1: $(docobjdir)/gcc.1
-	cp $(docobjdir)/gcc.1 $(docobjdir)/g++.1
+doc/g++.1: doc/gcc.1
+	cp doc/gcc.1 doc/g++.1
 
-c++.install-man: installdirs $(docobjdir)/g++.1
-	-if [ -f cc1plus$(exeext) ] ; then \
-	  rm -f $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \
-	  $(INSTALL_DATA) $(docobjdir)/g++.1 $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \
-	  chmod a-x $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext); \
-	else true; fi
+c++.install-man: installdirs $(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext) 
+
+$(DESTDIR)$(man1dir)/$(GXX_INSTALL_NAME)$(man1ext): doc/g++.1
+	-rm -f $@
+	-$(INSTALL_DATA) $< $@
+	-chmod a-x $@
 
 c++.uninstall:
 	-rm -rf $(DESTDIR)$(bindir)/$(CXX_INSTALL_NAME)$(exeext)
@@ -177,7 +182,7 @@ c++.uninstall:
 # We just have to delete files specific to us.
 
 c++.mostlyclean:
-	-rm -f $(docobjdir)/g++.1
+	-rm -f doc/g++.1
 	-rm -f cp/*$(objext)
 	-rm -f cp/*$(coverageexts)
 c++.clean:
diff --git a/gcc/f/ChangeLog b/gcc/f/ChangeLog
index 68c62bfd92c..26d61219b03 100644
--- a/gcc/f/ChangeLog
+++ b/gcc/f/ChangeLog
@@ -1,3 +1,18 @@
+2004-01-20  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* Make-lang.in: Replace $(docdir) with doc.
+	(TEXI_G77_FILES): Define.
+	(f77.rebuilt): Delete.
+	(f77.srcextra): Add dependencies on f/BUGS and f/NEWS.
+	(f77.srcman, f77.srcinfo, f77.man, f77.info): New rules.
+	(doc/g77.info, doc/g77.dvi): Depend on TEXI_G77_FILES.  Always build in
+	doc directory.  Use $(MAKEINFOFLAGS).
+	(info, dvi, generated_manpages): Update to look in doc directory.
+	(f/BUGS, f/NEWS): Generate in build directory.
+	(f77.mostlyclean): Delete BUGS and NEWS from build directory.
+	(f77.maintainer-clean): Adjust to delete from source directory.
+	(f77.install-man): Revamp rule.
+
 2004-01-20  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* Make-lang.in (G77_INSTALL_NAME): Define via a immediate $(shell)
diff --git a/gcc/f/Make-lang.in b/gcc/f/Make-lang.in
index 717bfa2e993..a3f1fc01cfa 100644
--- a/gcc/f/Make-lang.in
+++ b/gcc/f/Make-lang.in
@@ -58,7 +58,7 @@ F77 f77: f771$(exeext)
   f77.install-normal \
   f77.install-common f77.install-man \
   f77.uninstall f77.mostlyclean f77.clean f77.distclean \
-  f77.maintainer-clean f77.rebuilt \
+  f77.maintainer-clean \
   f77.stage1 f77.stage2 f77.stage3 f77.stage4 \
   f77.stageprofile f77.stagefeedback
 
@@ -141,42 +141,40 @@ f77.all.build: g77$(exeext)
 f77.all.cross: g77-cross$(exeext)
 f77.start.encap: g77$(exeext)
 f77.rest.encap:
-f77.srcextra: 
+
+f77.srcinfo: doc/g77.info
+	-cp -p $^ $(srcdir)/doc
+f77.srcman: doc/g77.1
+	-cp -p $^ $(srcdir)/doc
+f77.srcextra: f/BUGS f/NEWS 
+	-cp -p $^ $(srcdir)/f
 
 f77.tags: force
 	cd $(srcdir)/f; etags -o TAGS.sub *.c *.h; \
 	etags --include TAGS.sub --include ../TAGS.sub
 
-info:: $(docobjdir)/g77.info
-dvi:: $(docobjdir)/g77.dvi
-generated-manpages:: $(docobjdir)/g77.1
+f77.info: doc/g77.info
+dvi:: doc/g77.dvi
+f77.man: doc/g77.1
 
 check-f77 : check-g77
 lang_checks += check-g77
 
 # g77 documentation.
-$(docobjdir)/g77.info: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
-		$(srcdir)/f/ffe.texi $(srcdir)/f/invoke.texi \
-		$(srcdir)/f/news.texi  $(srcdir)/f/intdoc.texi \
-		$(srcdir)/f/root.texi $(docdir)/include/fdl.texi \
-		$(docdir)/include/gpl.texi \
-		$(docdir)/include/funding.texi \
-		$(docdir)/include/gcc-common.texi \
-		stmp-docobjdir
-	if [ x$(BUILD_INFO) = xinfo ]; then \
+TEXI_G77_FILES = f/g77.texi f/bugs.texi f/ffe.texi f/invoke.texi \
+		 f/news.texi f/root.texi $(docdir)/include/fdl.texi \
+		 $(docdir)/include/gpl.texi $(docdir)/include/funding.texi \
+		 $(docdir)/include/gcc-common.texi $(srcdir)/f/intdoc.texi
+
+doc/g77.info: $(TEXI_G77_FILES)
+	if test "x$(BUILD_INFO)" = xinfo; then \
 	  rm -f $(@)*; \
-	  $(MAKEINFO) -I$(docdir)/include -I$(srcdir)/f -o $@ $<; \
+	  $(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include -I$(srcdir)/f \
+            -o$@ $<; \
 	else true; fi
 
-$(docobjdir)/g77.dvi: $(srcdir)/f/g77.texi $(srcdir)/f/bugs.texi \
-		$(srcdir)/f/ffe.texi $(srcdir)/f/invoke.texi \
-		$(srcdir)/f/news.texi  $(srcdir)/f/intdoc.texi \
-		$(srcdir)/f/root.texi $(docdir)/include/fdl.texi \
-		$(docdir)/include/gpl.texi \
-		$(docdir)/include/funding.texi \
-		$(docdir)/include/gcc-common.texi \
-		stmp-docobjdir
-	$(TEXI2DVI) -I $(srcdir)/f -I $(docdir)/include -o $@ $<
+doc/g77.dvi: $(TEXI_G77_FILES)
+	$(TEXI2DVI) -I $(srcdir)/f -I $(docdir)/include -I $(objdir)/f -o $@ $<
 
 .INTERMEDIATE: g77.pod
 g77.pod: f/invoke.texi
@@ -204,41 +202,43 @@ g77.pod: f/invoke.texi
 
 # If the documentation files depended on executables in the build
 # tree, there'd be no way to ship a source tree with the documentation
-# already generated such that `make' wouldn't attempt to rebuilt it.
+# already generated such that `make' wouldn't attempt to rebuild it.
 # So, we punt and arrange for the documentation files to depend on the
 # dependencies of the executables, not on the executables themselves.
 # But then, we have to build the executables explicitly in their build
 # rules.
 
-INTDOC_DEPS = $(srcdir)/f/intdoc.c $(srcdir)/f/intrin.h $(srcdir)/f/intrin.def
+INTDOC_DEPS = f/intdoc.c f/intrin.h f/intrin.def
 
-$(srcdir)/f/intdoc.texi: $(INTDOC_DEPS) $(srcdir)/f/intdoc.in
+$(srcdir)/f/intdoc.texi: $(INTDOC_DEPS) f/intdoc.in
 	$(MAKE) f/intdoc$(build_exeext)
 	f/intdoc$(build_exeext) > $(srcdir)/f/intdoc.texi
 
 f/intdoc$(build_exeext): $(INTDOC_DEPS) f/intdoc.h0 bconfig.h \
   $(SYSTEM_H) coretypes.h $(TM_H) $(BUILD_LIBDEPS)
-	  $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) $(INCLUDES) \
-		  $(srcdir)/f/intdoc.c $(BUILD_LIBS) -o f/intdoc$(build_exeext)
+	$(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) $(INCLUDES) $< \
+	  $(BUILD_LIBS) -o $@
 
 f/intdoc.h0: f/intdoc.in f/ansify$(build_exeext)
-	f/ansify$(build_exeext) $(srcdir)/f/intdoc.in \
-		< $(srcdir)/f/intdoc.in > f/intdoc.h0
+	f/ansify$(build_exeext) $< < $< > $@
 
 f/ansify$(build_exeext): f/ansify.c bconfig.h $(SYSTEM_H) coretypes.h $(TM_H)
-	  $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) $(INCLUDES) \
-	  	$(srcdir)/f/ansify.c -o f/ansify$(build_exeext)
+	  $(CC_FOR_BUILD) $(BUILD_CFLAGS) $(BUILD_LDFLAGS) $(INCLUDES) $< \
+	  -o $@
 
-$(srcdir)/f/BUGS: f/bugs0.texi f/bugs.texi f/root.texi
-	cd $(srcdir)/f; $(MAKEINFO) -D BUGSONLY --no-header --no-split \
-	  --no-validate -I../doc/include -o BUGS bugs0.texi
+f/BUGS: f/bugs0.texi f/bugs.texi f/root.texi
+	if [ x$(BUILD_INFO) = xinfo ]; then \
+	  rm -f $(@)*; \
+	  $(MAKEINFO) $(MAKEINFOFLAGS) -D BUGSONLY --no-header --no-split \
+           --no-validate -I$(docdir)/include -I$(srcdir)/f -o $@ bugs0.texi; \
+	else true; fi
 
-$(srcdir)/f/NEWS: f/news0.texi f/news.texi f/root.texi
-	cd $(srcdir)/f; $(MAKEINFO) -D NEWSONLY --no-header --no-split \
-	  --no-validate -I../doc/include -o NEWS news0.texi
-
-f77.rebuilt: $(docobjdir)/g77.info $(srcdir)/f/BUGS \
-  $(srcdir)/f/NEWS 
+f/NEWS: f/news0.texi f/news.texi f/root.texi
+	if [ x$(BUILD_INFO) = xinfo ]; then \
+	  rm -f $(@)*; \
+	  $(MAKEINFO) $(MAKEINFOFLAGS) -D NEWSONLY --no-header --no-split \
+           --no-validate -I$(docdir)/include -I$(srcdir)/f -o $@ news0.texi; \
+	else true; fi
 
 #
 # Install hooks:
@@ -266,12 +266,12 @@ f77.install-common: installdirs
 
 install-info:: $(DESTDIR)$(infodir)/g77.info
 
-f77.install-man: $(GENERATED_MANPAGES) installdirs
-	-if [ -f f771$(exeext) ] ; then \
-	  rm -f $(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \
-	  $(INSTALL_DATA) $(docobjdir)/g77.1 $(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \
-	  chmod a-x $(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext); \
-	else true; fi
+f77.install-man: installdirs $(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext)
+
+$(DESTDIR)$(man1dir)/$(G77_INSTALL_NAME)$(man1ext): doc/g77.1
+	-rm -f $@
+	-$(INSTALL_DATA) $< $@
+	-chmod a-x $@
 
 f77.uninstall: installdirs
 	if $(SHELL) -c 'install-info --version | sed 1q | fgrep -s -v -i debian' >/dev/null 2>&1; then \
@@ -290,7 +290,7 @@ f77.mostlyclean:
 	-rm -f f/*$(objext)
 	-rm -f f/*$(coverageexts)
 	-rm -f f/fini$(build_exeext) f/stamp-str f/str-*.h f/str-*.j
-	-rm -f f/intdoc$(build_exeext) f/ansify$(build_exeext) f/intdoc.h0
+	-rm -f f/BUGS f/NEWS
 	-rm -f g77.aux g77.cps g77.ky g77.toc g77.vr g77.fn g77.kys \
 	       g77.pg g77.tp g77.vrs g77.cp g77.fns g77.log g77.pgs g77.tps 
 f77.clean:
@@ -298,7 +298,8 @@ f77.clean:
 f77.distclean:
 	-rm -f f/Makefile
 f77.maintainer-clean:
-	-rm -f f/g77.info* f/g77.*aux f/TAGS f/TAGS.sub f/BUGS f/NEWS f/intdoc.texi
+	-rm -f $(srcdir)/f/BUGS $(srcdir)/f/TAGS $(srcdir)/f/TAGS.SUB
+	-rm -f $(srcdir)/f/NEWS $(srcdir)/f/intdoc.texi
 #
 # Stage hooks:
 # The main makefile has already created stage?/f.
diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index e7b4c169bec..d9027c016fb 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-20  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* Make-lang.in: Replace $(docdir) with doc.
+	(java.info, java.srcinfo, java.man, java.srcman): New rules.
+	(java.install-man): Revamp rule.
+	
 2004-01-20  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* Make-lang.in (JAVA_INSTALL_NAME, JAVA_TARGET_INSTALL_NAME, 
diff --git a/gcc/java/Make-lang.in b/gcc/java/Make-lang.in
index 00d9270655b..59f8bc4d09e 100644
--- a/gcc/java/Make-lang.in
+++ b/gcc/java/Make-lang.in
@@ -161,12 +161,19 @@ java.tags: force
 	etags --include TAGS.sub --include ../TAGS.sub
 
 
-info:: $(docobjdir)/gcj.info
-dvi:: $(docobjdir)/gcj.dvi
-generated-manpages:: $(docobjdir)/gcj.1 $(docobjdir)/gcjh.1 \
-	$(docobjdir)/jv-scan.1 $(docobjdir)/jcf-dump.1 \
-	$(docobjdir)/gij.1 $(docobjdir)/jv-convert.1 \
-	$(docobjdir)/rmic.1 $(docobjdir)/rmiregistry.1
+java.info: doc/gcj.info
+
+java.srcinfo: doc/gcj.info
+	-cp -p $^ $(srcdir)/doc
+
+dvi:: doc/gcj.dvi
+JAVA_MANFILES = doc/gcj.1 doc/gcjh.1 doc/jv-scan.1 doc/jcf-dump.1 doc/gij.1 \
+                doc/jv-convert.1 doc/rmic.1 doc/rmiregistry.1
+
+java.man: $(JAVA_MANFILES)
+
+java.srcman: $(JAVA_MANFILES)
+	-cp -p $^ $(srcdir)/doc
 
 check-java :
 
@@ -355,16 +362,15 @@ java/java-tree-inline.o: tree-inline.c $(CONFIG_H) $(SYSTEM_H) coretypes.h \
 	$(srcdir)/tree-inline.c -o $@
 
 # Documentation
-$(docobjdir)/gcj.info: java/gcj.texi $(docdir)/include/fdl.texi \
-  $(docdir)/include/gpl.texi $(docdir)/include/gcc-common.texi stmp-docobjdir
+doc/gcj.info: java/gcj.texi $(docdir)/include/fdl.texi \
+  $(docdir)/include/gpl.texi $(docdir)/include/gcc-common.texi
 	if test "x$(BUILD_INFO)" = xinfo; then \
 	  rm -f doc/gcj.info*; \
 	  $(MAKEINFO) $(MAKEINFOFLAGS) -I $(docdir)/include -o $@ $<; \
 	else true; fi
 
-$(docobjdir)/gcj.dvi: java/gcj.texi $(docdir)/include/fdl.texi \
-	 $(docdir)/include/gpl.texi $(docdir)/include/gcc-common.texi \
-	 stmp-docobjdir
+doc/gcj.dvi: java/gcj.texi $(docdir)/include/fdl.texi \
+	 $(docdir)/include/gpl.texi $(docdir)/include/gcc-common.texi
 	$(TEXI2DVI) -I $(docdir)/include -o $@ $<
 
 .INTERMEDIATE: gcj.pod gcjh.pod jv-scan.pod jcf-dump.pod gij.pod \
@@ -388,30 +394,18 @@ rmiregistry.pod: java/gcj.texi
 	-$(TEXI2POD) -D rmiregistry < $< > $@
 
 # Install the man pages.
-java.install-man: installdirs $(GENERATED_JAVA_MANPAGES)
-	-if [ -f $(GCJ)$(exeext) ]; then \
-	  rm -f $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \
-	  $(INSTALL_DATA) $(docobjdir)/gcj.1 $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \
-	  chmod a-x $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext); \
-	fi
-	-rm -f $(DESTDIR)$(man1dir)/gcjh$(man1ext)
-	-$(INSTALL_DATA) $(docobjdir)/gcjh.1 $(DESTDIR)$(man1dir)/gcjh$(man1ext)
-	-chmod a-x $(DESTDIR)$(man1dir)/gcjh$(man1ext)
-	-rm -f $(DESTDIR)$(man1dir)/jv-scan$(man1ext)
-	-$(INSTALL_DATA) $(docobjdir)/jv-scan.1 $(DESTDIR)$(man1dir)/jv-scan$(man1ext)
-	-chmod a-x $(DESTDIR)$(man1dir)/jv-scan$(man1ext)
-	-rm -f $(DESTDIR)$(man1dir)/jcf-dump$(man1ext)
-	-$(INSTALL_DATA) $(docobjdir)/jcf-dump.1 $(DESTDIR)$(man1dir)/jcf-dump$(man1ext)
-	-chmod a-x $(DESTDIR)$(man1dir)/jcf-dump$(man1ext)
-	-rm -f $(DESTDIR)$(man1dir)/gij$(man1ext)
-	-$(INSTALL_DATA) $(docobjdir)/gij.1 $(DESTDIR)$(man1dir)/gij$(man1ext)
-	-chmod a-x $(DESTDIR)$(man1dir)/gij$(man1ext)
-	-rm -f $(DESTDIR)$(man1dir)/jv-convert$(man1ext)
-	-$(INSTALL_DATA) $(docobjdir)/jv-convert.1 $(DESTDIR)$(man1dir)/jv-convert$(man1ext)
-	-chmod a-x $(DESTDIR)$(man1dir)/jv-convert$(man1ext)
-	-rm -f $(DESTDIR)$(man1dir)/rmic$(man1ext)
-	-$(INSTALL_DATA) $(docobjdir)/rmic.1 $(DESTDIR)$(man1dir)/rmic$(man1ext)
-	-chmod a-x $(DESTDIR)$(man1dir)/rmic$(man1ext)
-	-rm -f $(DESTDIR)$(man1dir)/rmiregistry$(man1ext)
-	-$(INSTALL_DATA) $(docobjdir)/rmiregistry.1 $(DESTDIR)$(man1dir)/rmiregistry$(man1ext)
-	-chmod a-x $(DESTDIR)$(man1dir)/rmiregistry$(man1ext)
+java.install-man: installdirs \
+                  $(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext) \
+                  $(DESTDIR)$(man1dir)/gcjh$(man1ext) \
+                  $(DESTDIR)$(man1dir)/jv-scan$(man1ext) \
+                  $(DESTDIR)$(man1dir)/jcf-dump$(man1ext) \
+                  $(DESTDIR)$(man1dir)/gij$(man1ext) \
+                  $(DESTDIR)$(man1dir)/jv-convert$(man1ext) \
+                  $(DESTDIR)$(man1dir)/jv-convert$(man1ext) \
+                  $(DESTDIR)$(man1dir)/rmic$(man1ext) \
+                  $(DESTDIR)$(man1dir)/rmiregistry$(man1ext)
+
+$(DESTDIR)$(man1dir)/$(JAVA_INSTALL_NAME)$(man1ext): doc/gcj.1
+	-rm -f $@
+	-$(INSTALL_DATA) $< $@
+	-chmod a-x $@
diff --git a/gcc/objc/Make-lang.in b/gcc/objc/Make-lang.in
index 70b9e4def22..022453fdbcf 100644
--- a/gcc/objc/Make-lang.in
+++ b/gcc/objc/Make-lang.in
@@ -96,6 +96,10 @@ objc.all.build:
 objc.all.cross:
 objc.start.encap:
 objc.rest.encap:
+objc.info:
+objc.man:
+objc.srcinfo:
+objc.srcman:
 
 objc.tags: force
 	cd $(srcdir)/objc; etags -o TAGS.sub *.y *.c *.h; \
diff --git a/gcc/treelang/ChangeLog b/gcc/treelang/ChangeLog
index e4281b080a8..3e817c16371 100644
--- a/gcc/treelang/ChangeLog
+++ b/gcc/treelang/ChangeLog
@@ -1,3 +1,9 @@
+2004-01-20  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* Make-lang.in: Replace $(docdir) with doc.
+	(treelang.info, treelang.srcinfo): New rules.
+	(treelang.man, treelang.man): Dummy entries.
+
 2004-01-15  Kelley Cook  <kcook@gcc.gnu.org>
 
 	* Make-lang.in (TREE_GENERATED): Delete reference to $(parsedir).
diff --git a/gcc/treelang/Make-lang.in b/gcc/treelang/Make-lang.in
index 1cb438ad8eb..46d20be9e74 100644
--- a/gcc/treelang/Make-lang.in
+++ b/gcc/treelang/Make-lang.in
@@ -139,28 +139,28 @@ treelang.all.cross:
 
 treelang.start.encap:
 treelang.rest.encap:
+treelang.man:
+treelang.srcman:
 
 treelang.tags: force
 	cd $(srcdir)/treelang; etags -o TAGS.sub *.y *.l *.c *.h; \
 	etags --include TAGS.sub --include ../TAGS.sub
 
-info:: $(docobjdir)/treelang.info
-dvi:: $(docobjdir)/treelang.dvi
+treelang.info: doc/treelang.info
 
-$(docobjdir)/treelang.info: treelang/treelang.texi \
-	 $(docdir)/include/gcc-common.texi \
-	 $(docdir)/include/gpl.texi \
-	 $(docdir)/include/fdl.texi \
-	 $(docdir)/include/funding.texi \
-	 stmp-docobjdir
+treelang.srcinfo: doc/treelang.info
+	-cp -p $^ $(srcdir)/doc
+
+dvi:: doc/treelang.dvi
+
+doc/treelang.info: treelang/treelang.texi $(docdir)/include/gcc-common.texi \
+	 $(docdir)/include/gpl.texi $(docdir)/include/fdl.texi \
+	 $(docdir)/include/funding.texi
 	$(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include -o $@ $<
 
-$(docobjdir)/treelang.dvi: treelang/treelang.texi \
-	 $(docdir)/include/gcc-common.texi \
-	 $(docdir)/include/gpl.texi \
-	 $(docdir)/include/fdl.texi \
-	 $(docdir)/include/funding.texi \
-	 stmp-docobjdir
+doc/treelang.dvi: treelang/treelang.texi $(docdir)/include/gcc-common.texi \
+	 $(docdir)/include/gpl.texi $(docdir)/include/fdl.texi \
+	 $(docdir)/include/funding.texi
 	$(TEXI2DVI) -I $(docdir)/include -o $@ $<
 
 #
diff --git a/maintainer-scripts/ChangeLog b/maintainer-scripts/ChangeLog
index b178b442a84..2224f4bb835 100644
--- a/maintainer-scripts/ChangeLog
+++ b/maintainer-scripts/ChangeLog
@@ -1,3 +1,7 @@
+2004-01-20  Kelley Cook  <kcook@gcc.gnu.org>
+
+	* gcc_release (build_sources): Delete call to make f77.rebuilt.
+
 2004-01-17  Gerald Pfeifer  <gerald@pfeifer.com>
 
 	* snapshot-README: Mention how the snapshot was generated.