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, 9 insertions, 2 deletions

diff --git a/gcc/configure b/gcc/configure
index c2074172885..1f1133b5354 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -309,7 +309,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 target_noncanonical build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP strict1_warn warn_cflags WERROR nocommon_flag TREEBROWSER 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_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR stage1_cflags COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump ORIGINAL_OBJDUMP_FOR_TARGET libgcc_visibility 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_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir libstdcxx_incdir host_exeext 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 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 c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC 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 target_noncanonical build_subdir host_subdir target_subdir GENINSRC CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT NO_MINUS_C_MINUS_O OUTPUT_OPTION CPP EGREP strict1_warn warn_cflags WERROR nocommon_flag TREEBROWSER 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 datarootdir docdir htmldir SET_MAKE AWK LN_S LN RANLIB ac_ct_RANLIB ranlib_flags INSTALL INSTALL_PROGRAM INSTALL_DATA make_compare_target have_mktemp_command MAKEINFO BUILD_INFO GENERATED_MANPAGES FLEX BISON NM AR stage1_cflags COLLECT2_LIBS GNAT_LIBEXC LDEXP_LIB TARGET_GETGROUPS_T LIBICONV LTLIBICONV LIBICONV_DEP manext objext gthread_flags extra_modes_file extra_opt_files USE_NLS LIBINTL LIBINTL_DEP INCINTL XGETTEXT GMSGFMT POSUB CATALOGS host_cc_for_libada CROSS ALL SYSTEM_HEADER_DIR inhibit_libc CC_FOR_BUILD BUILD_CFLAGS STMP_FIXINC STMP_FIXPROTO collect2 gcc_cv_as ORIGINAL_AS_FOR_TARGET gcc_cv_ld ORIGINAL_LD_FOR_TARGET gcc_cv_nm ORIGINAL_NM_FOR_TARGET gcc_cv_objdump ORIGINAL_OBJDUMP_FOR_TARGET libgcc_visibility 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_gcc_objs extra_headers_list extra_objs extra_parts extra_passes extra_programs float_h_file gcc_config_arguments gcc_gxx_include_dir libstdcxx_incdir host_exeext 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 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 c_target_objs cxx_target_objs target_cpu_default GMPLIBS GMPINC LIBOBJS LTLIBOBJS'
 ac_subst_files='language_hooks'
 
 # Initialize some variables set by options.
@@ -7064,6 +7064,10 @@ do
 	esac
 done
 
+# Used by documentation targets
+
+
+
 
 # -------------------------
 # Checks for other programs
@@ -7492,7 +7496,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:7495: version of makeinfo is $ac_prog_version" >&5
+  echo "configure:7499: version of makeinfo is $ac_prog_version" >&5
   case $ac_prog_version in
     '')     gcc_cv_prog_makeinfo_modern=no;;
     4.[2-9]*)
@@ -17240,6 +17244,9 @@ s,@TARGET_SYSTEM_ROOT@,$TARGET_SYSTEM_ROOT,;t t
 s,@TARGET_SYSTEM_ROOT_DEFINE@,$TARGET_SYSTEM_ROOT_DEFINE,;t t
 s,@CROSS_SYSTEM_HEADER_DIR@,$CROSS_SYSTEM_HEADER_DIR,;t t
 s,@onestep@,$onestep,;t t
+s,@datarootdir@,$datarootdir,;t t
+s,@docdir@,$docdir,;t t
+s,@htmldir@,$htmldir,;t t
 s,@SET_MAKE@,$SET_MAKE,;t t
 s,@AWK@,$AWK,;t t
 s,@LN_S@,$LN_S,;t t