2006-04-19 Carlos O'Donell <carlos@codesourcery.com>

	* Makefile.tpl: Add install-html target.
	* Makefile.def: Add install-html target.
	* Makefile.in: Regenerate.
	* configure.in: Add --with-datarootdir, --with-docdir,
	and --with-htmldir options. AC_SUBST datarootdir, docdir and htmldir.
	* configure: Regenerate.
	* gcc/Makefile.in: Rename htmldir to gcc_htmldir. Add install-html 
	target. Define HTMLS for all manuals. Simplify html target.
	* gcc/configure.ac: AC_SUBST datarootdir, docdir, and htmldir.
	* gcc/configure: Regenerate.
	* gcc/fortran/Make-lang.in: Rename htmldir to gcc_htmldir.
	* gcc/java/Make-lang.in: Likewise.
	* gcc/treelang/Make-lang.in: Likewise.
	* fixincludes/Makefile.in: Add install-html target.
	Fixup .PHONY listing.
	* intl/Makefile.in: Add html info ps pdf and dvi and install-html 
	to .PHONY. Add install-html target.
	* libcpp/Makefile.in: Add install-html target. Add install-html to
	.PHONY list.
	* libstdc++-v3/Makefile.am: Add install-html target.
	* libstdc++-v3/aclocal.m4: Regenerate.
	* libstdc++-v3/Makefile.in: Regenerate.
	* libstdc++-v3/include/Makefile.in: Regenerate.
	* libstdc++-v3/libmath/Makefile.in: Regenerate.
	* libstdc++-v3/libsupc++/Makefile.in: Regenerate.
	* libstdc++-v3/po/Makefile.in: Regenerate.
	* libstdc++-v3/src/Makefile.in: Regenerate.
	* libstdc++-v3/testsuite/Makefile.in: Regenerate.
	* libmudflap/Makefile.am: Add install-html target.
	* libmudflap/Makefile.in: Regenerate. 
	* libssp/Makefile.am: Add install-html target.
	* libssp/Makefile.in: Regenerate.
	* fastjar/Makefile.am: Add install-html target.
	* fastjar/Makefile.in: Regenerate.
	* fastjar/aclocal.m4: Regenerate.
	* zlib/Makefile.am: Add install-html target.
	* zlib/Makefile.in: Regenerate.
	* zlib/aclocal.m4: Regenerate.
	* libobjc/Makefile.in: Add install-html target.
	* libffi/Makefile.am: Add install-html target.
	* libffi/Makefile.in: Regenerate.
	* libffi/aclocal.m4: Regenerate.
	* libffi/include/Makefile.in: Regenerate.
	* libffi/testsuite/Makefile.in: Regenerate.
	* libjava/Makefile.am: Add install-html target.
	* libjava/Makefile.in: Regenerate. 
	* libjava/aclocal.m4: Regenerate.
	* libjava/classpath/Makefile.in: Regenerate.
	* libjava/classpath/aclocal.m4: Regenerate.
	* libjava/classpath/doc/Makefile.in: Regenerate.
	* libjava/classpath/doc/api/Makefile.am: Conditionalize html target.
	* libjava/classpath/doc/api/Makefile.in: Regenerate.
	* libjava/classpath/examples/Makefile.in: Regenerate.
	* libjava/classpath/external/Makefile.in: Regenerate.
	* libjava/classpath/external/sax/Makefile.in: Regenerate.
	* libjava/classpath/external/w3c_dom/Makefile.in: Regenerate.
	* libjava/classpath/include/Makefile.in: Regenerate.
	* libjava/classpath/lib/Makefile.in: Regenerate.
	* libjava/classpath/native/Makefile.in: Regenerate.
	* libjava/classpath/native/fdlibm/Makefile.in: Regenerate.
	* libjava/classpath/native/jawt/Makefile.in: Regenerate.
	* libjava/classpath/native/jni/Makefile.in: Regenerate.
	* libjava/classpath/native/jni/classpath/Makefile.in: Regenerate.
	* libjava/classpath/native/jni/gtk-peer/Makefile.in : Regenerate.
	* libjava/classpath/native/jni/java-io/Makefile.in: Regenerate.
	* libjava/classpath/native/jni/java-lang/Makefile.in: Regenerate.
	* libjava/classpath/native/jni/java-net/Makefile.in : Regenerate.
	* libjava/classpath/native/jni/java-nio/Makefile.in : Regenerate.
	* libjava/classpath/native/jni/java-util/Makefile.in: Regenerate.
	* libjava/classpath/native/jni/midi-alsa/Makefile.in: Regenerate.
	* libjava/classpath/native/jni/midi-dssi/Makefile.in: Regenerate.
	* libjava/classpath/native/jni/qt-peer/Makefile.in: Regenerate.
	* libjava/classpath/native/jni/xmlj/Makefile.in: Regenerate.
	* libjava/classpath/native/target/Linux/Makefile.in: Regenerate.
	* libjava/classpath/native/target/Makefile.in: Regenerate.
	* libjava/classpath/native/target/generic/Makefile.in: Regenerate.
	* libjava/classpath/resource/Makefile.in: Regenerate.
	* libjava/classpath/scripts/Makefile.in: Regenerate.
	* libjava/gcj/Makefile.in: Regenerate.
	* libjava/include/Makefile.in : Regenerate.
	* libjava/testsuite/Makefile.in: Regenerate.
	* boehm-gc/Makefile.am: Add install-html target.
	* boehm-gc/Makefile.in: Regenerate.
	* boehm-gc/aclocal.m4: Regenerate.
	* boehm-gc/include/Makefile.in: Regenerate.
	* gnattools/Makefile.in: Add html and install-html targets.
	* libgfortran/Makefile.am: Add install-html target.
	* libgfortran/Makefile.in: Regenerate. 
	* libada/Makefile.in: Add install-html target.
	


git-svn-id: https://gcc.gnu.org/svn/gcc/branches/csl/sourcerygxx-4_1@113156 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 12 insertions, 12 deletions

diff --git a/gcc/ada/Make-lang.in b/gcc/ada/Make-lang.in
index 62f5304857f..4a7d4af28f4 100644
--- a/gcc/ada/Make-lang.in
+++ b/gcc/ada/Make-lang.in
@@ -391,27 +391,27 @@ doc/gnat_ugn_unw.texi: $(srcdir)/ada/gnat_ugn.texi $(srcdir)/ada/ug_words
 	   $(srcdir)/ada/ug_words doc/gnat_ugn_unw.texi
 
 doc/gnat_ugn_unw.info: doc/gnat_ugn_unw.texi			\
-   $(docdir)/include/fdl.texi $(docdir)/include/gcc-common.texi	\
+   $(gcc_docdir)/include/fdl.texi $(gcc_docdir)/include/gcc-common.texi	\
    gcc-vers.texi
 
 	if [ x$(BUILD_INFO) = xinfo ]; then \
 	  rm -f $(@)*; \
-	  $(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include \
+	  $(MAKEINFO) $(MAKEINFOFLAGS) -I$(gcc_docdir)/include \
             -I$(srcdir)/ada -o $@ $<; \
 	else true; fi
 
-doc/gnat_rm.info: ada/gnat_rm.texi $(docdir)/include/fdl.texi	\
-   $(docdir)/include/gcc-common.texi gcc-vers.texi
+doc/gnat_rm.info: ada/gnat_rm.texi $(gcc_docdir)/include/fdl.texi	\
+   $(gcc_docdir)/include/gcc-common.texi gcc-vers.texi
 	if [ x$(BUILD_INFO) = xinfo ]; then \
 	  rm -f $(@)*; \
-	  $(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include \
+	  $(MAKEINFO) $(MAKEINFOFLAGS) -I$(gcc_docdir)/include \
             -I$(srcdir)/ada -o $@ $<; \
 	else true; fi
 
-doc/gnat-style.info: ada/gnat-style.texi $(docdir)/include/fdl.texi
+doc/gnat-style.info: ada/gnat-style.texi $(gcc_docdir)/include/fdl.texi
 	if [ x$(BUILD_INFO) = xinfo ]; then \
 	  rm -f $(@)*; \
-	  $(MAKEINFO) $(MAKEINFOFLAGS) -I$(docdir)/include \
+	  $(MAKEINFO) $(MAKEINFOFLAGS) -I$(gcc_docdir)/include \
             -I$(srcdir)/ada -o $@ $<; \
 	else true; fi
 
@@ -430,15 +430,15 @@ install-info:: $(DESTDIR)$(infodir)/gnat_ugn_unw.info \
 dvi:: doc/gnat_ugn_unw.dvi \
       doc/gnat_rm.dvi doc/gnat-style.dvi
 
-doc/gnat_ugn_unw.dvi: doc/gnat_ugn_unw.texi $(docdir)/include/fdl.texi	\
-	$(docdir)/include/gcc-common.texi gcc-vers.texi
+doc/gnat_ugn_unw.dvi: doc/gnat_ugn_unw.texi $(gcc_docdir)/include/fdl.texi	\
+	$(gcc_docdir)/include/gcc-common.texi gcc-vers.texi
 	$(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $<
 
-doc/gnat_rm.dvi: ada/gnat_rm.texi $(docdir)/include/fdl.texi	\
-	$(docdir)/include/gcc-common.texi gcc-vers.texi
+doc/gnat_rm.dvi: ada/gnat_rm.texi $(gcc_docdir)/include/fdl.texi	\
+	$(gcc_docdir)/include/gcc-common.texi gcc-vers.texi
 	$(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $<
 
-doc/gnat-style.dvi: ada/gnat-style.texi $(docdir)/include/fdl.texi
+doc/gnat-style.dvi: ada/gnat-style.texi $(gcc_docdir)/include/fdl.texi
 	$(TEXI2DVI) -c -I $(abs_docdir)/include -o $@ $<