Skip to content

R
riscv-gcc-1
Commit 22482f74 by Mike Stump Committed by Mike Stump
Options

Makefile.in: Rename to htmldir to build_htmldir to avoid installing during build. 

	* Makefile.in: Rename to htmldir to build_htmldir to avoid
	installing during build.

java,fortran:
	* Make-lang.in: Rename to htmldir to build_htmldir to avoid
	installing during build.

treelang:
	* Make-lang.in: Rename to gcc_htmldir to build_htmldir to avoid
	installing during build.

From-SVN: r114426
parent bb83aa4b
Showing with 101 additions and 20 deletions
gcc/ChangeLog
2006-06-06 Mike Stump <mrs@apple.com>
* Makefile.in: Rename to htmldir to build_htmldir to avoid
installing during build.
2006-06-06 Maxim Kuvyrkov <mkuvyrkov@ispras.ru>
* params.def (PARAM_MAX_SCHED_EXTEND_REGIONS_ITERS): Change default
......
gcc/Makefile.in
......@@ -509,8 +509,12 @@ man7dir = $(mandir)/man7
# Dir for temp files.
tmpdir = /tmp
datarootdir = @datarootdir@
docdir = @docdir@
# Directory in which to bujild HTML
build_htmldir = $(objdir)/HTML/gcc-$(version)
# Directory in which to put HTML
htmldir = $(objdir)/HTML/gcc-$(version)
htmldir = @htmldir@
# Whether we were configured with NLS.
USE_NLS = @USE_NLS@
......@@ -3409,10 +3413,10 @@ doc/gcc.dvi: $(TEXI_GCC_FILES)
doc/gccint.dvi: $(TEXI_GCCINT_FILES)
doc/cppinternals.dvi: $(TEXI_CPPINT_FILES)
$(htmldir)/cpp/index.html: $(TEXI_CPP_FILES)
$(htmldir)/gcc/index.html: $(TEXI_GCC_FILES)
$(htmldir)/gccint/index.html: $(TEXI_GCCINT_FILES)
$(htmldir)/cppinternals/index.html: $(TEXI_CPPINT_FILES)
$(build_htmldir)/cpp/index.html: $(TEXI_CPP_FILES)
$(build_htmldir)/gcc/index.html: $(TEXI_GCC_FILES)
$(build_htmldir)/gccint/index.html: $(TEXI_GCCINT_FILES)
$(build_htmldir)/cppinternals/index.html: $(TEXI_CPPINT_FILES)
dvi:: doc/gcc.dvi doc/gccint.dvi doc/gccinstall.dvi doc/cpp.dvi \
doc/cppinternals.dvi lang.dvi
......@@ -3424,17 +3428,20 @@ doc/%.dvi: %.texi
doc/gccinstall.dvi: $(TEXI_GCCINSTALL_FILES)
$(TEXI2DVI) -I . -I $(abs_docdir) -I $(abs_docdir)/include -o $@ $<
html:: $(htmldir)/cpp/index.html $(htmldir)/gcc/index.html \
$(htmldir)/gccinstall/index.html $(htmldir)/gccint/index.html \
$(htmldir)/cppinternals/index.html lang.html
html:: $(build_htmldir)/cpp/index.html $(build_htmldir)/gcc/index.html \
$(build_htmldir)/gccinstall/index.html $(build_htmldir)/gccint/index.html \
$(build_htmldir)/cppinternals/index.html lang.html
$(htmldir)/%/index.html: %.texi
install-html:: installdirs
cp -rp $(build_htmldir) $(DESTDIR)/$(htmldir)
$(build_htmldir)/%/index.html: %.texi
$(mkinstalldirs) $(@D)
rm -f $(@D)/*
$(TEXI2HTML) -I $(abs_docdir) -I $(abs_docdir)/include -o $(@D) $<
# Duplicate entry to handle renaming of gccinstall
$(htmldir)/gccinstall/index.html: $(TEXI_GCCINSTALL_FILES)
$(build_htmldir)/gccinstall/index.html: $(TEXI_GCCINSTALL_FILES)
$(mkinstalldirs) $(@D)
echo rm -f $(@D)/*
$(TEXI2HTML) -I $(abs_docdir) -I $(abs_docdir)/include -o $(@D) $<
......
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 cxx_compat_warn warn_cflags WERROR nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float 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 DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT 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 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_selected_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 cxx_compat_warn warn_cflags WERROR nocommon_flag TREEBROWSER valgrind_path valgrind_path_defines valgrind_command coverage_flags enable_multilib enable_decimal_float 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 DATADIRNAME INSTOBJEXT GENCAT CATOBJEXT 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 libgcc_visibility GGC zlibdir zlibinc MAINT gcc_tooldir dollar slibdir objdir datarootdir docdir htmldir 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_selected_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.
......@@ -936,7 +936,10 @@ Optional Packages:
--with-gc={page,zone} choose the garbage collection mechanism to use
with the compiler
--with-system-zlib use installed libz
--with-slibdir=DIR shared libraries in DIR LIBDIR
--with-slibdir=DIR shared libraries in DIR [LIBDIR]
--with-datarootdir=DIR Use DIR as the data root [PREFIX/share]
--with-docdir=DIR Install documentation in DIR [DATAROOTDIR]
--with-htmldir=DIR html documentation in in DIR [DOCDIR]
Some influential environment variables:
CC C compiler command
......@@ -7613,7 +7616,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:7616: version of makeinfo is $ac_prog_version" >&5
echo "configure:7619: version of makeinfo is $ac_prog_version" >&5
case $ac_prog_version in
'') gcc_cv_prog_makeinfo_modern=no;;
4.[4-9]*)
......@@ -16158,6 +16161,36 @@ fi;
objdir=`${PWDCMD-pwd}`
# Check whether --with-datarootdir or --without-datarootdir was given.
if test "${with_datarootdir+set}" = set; then
withval="$with_datarootdir"
datarootdir="\${prefix}/$with_datarootdir"
else
datarootdir='$(prefix)/share'
fi;
# Check whether --with-docdir or --without-docdir was given.
if test "${with_docdir+set}" = set; then
withval="$with_docdir"
docdir="\${prefix}/$with_docdir"
else
docdir='$(datarootdir)'
fi;
# Check whether --with-htmldir or --without-htmldir was given.
if test "${with_htmldir+set}" = set; then
withval="$with_htmldir"
htmldir="\${prefix}/$with_htmldir"
else
htmldir='$(docdir)'
fi;
# Substitute configuration variables
......@@ -16991,6 +17024,9 @@ s,@gcc_tooldir@,$gcc_tooldir,;t t
s,@dollar@,$dollar,;t t
s,@slibdir@,$slibdir,;t t
s,@objdir@,$objdir,;t t
s,@datarootdir@,$datarootdir,;t t
s,@docdir@,$docdir,;t t
s,@htmldir@,$htmldir,;t t
s,@subdirs@,$subdirs,;t t
s,@srcdir@,$srcdir,;t t
s,@all_boot_languages@,$all_boot_languages,;t t
......
gcc/configure.ac
......@@ -3498,7 +3498,7 @@ AC_ARG_ENABLE(version-specific-runtime-libs,
installed in a compiler-specific directory])
AC_ARG_WITH(slibdir,
[ --with-slibdir=DIR shared libraries in DIR [LIBDIR]],
[ --with-slibdir=DIR shared libraries in DIR [[LIBDIR]]],
slibdir="$with_slibdir",
if test "${enable_version_specific_runtime_libs+set}" = set; then
slibdir='$(libsubdir)'
......@@ -3512,6 +3512,24 @@ AC_SUBST(slibdir)
objdir=`${PWDCMD-pwd}`
AC_SUBST(objdir)
AC_ARG_WITH(datarootdir,
[ --with-datarootdir=DIR Use DIR as the data root [[PREFIX/share]]],
datarootdir="\${prefix}/$with_datarootdir",
datarootdir='$(prefix)/share')
AC_SUBST(datarootdir)
AC_ARG_WITH(docdir,
[ --with-docdir=DIR Install documentation in DIR [[DATAROOTDIR]]],
docdir="\${prefix}/$with_docdir",
docdir='$(datarootdir)')
AC_SUBST(docdir)
AC_ARG_WITH(htmldir,
[ --with-htmldir=DIR html documentation in in DIR [[DOCDIR]]],
htmldir="\${prefix}/$with_htmldir",
htmldir='$(docdir)')
AC_SUBST(htmldir)
# Substitute configuration variables
AC_SUBST(subdirs)
AC_SUBST(srcdir)
......
gcc/fortran/ChangeLog
2006-06-06 Mike Stump <mrs@apple.com>
* Make-lang.in: Rename to htmldir to build_htmldir to avoid
installing during build.
2006-06-06 Paul Thomas <pault@gcc.gnu.org>
PR fortran/27897
......
gcc/fortran/Make-lang.in
......@@ -127,7 +127,7 @@ fortran.tags: force
fortran.info: doc/gfortran.info
fortran.dvi: doc/gfortran.dvi
fortran.html: $(htmldir)/gfortran/index.html
fortran.html: $(build_htmldir)/gfortran/index.html
F95_MANFILES = doc/gfortran.1
......@@ -162,7 +162,7 @@ doc/gfortran.info: $(GFORTRAN_TEXI)
doc/gfortran.dvi: $(GFORTRAN_TEXI)
$(TEXI2DVI) -I $(srcdir)/fortran -I $(abs_docdir)/include -o $@ $<
$(htmldir)/gfortran/index.html: $(GFORTRAN_TEXI)
$(build_htmldir)/gfortran/index.html: $(GFORTRAN_TEXI)
$(mkinstalldirs) $(@D)
rm -f $(@D)/*
$(TEXI2HTML) -I $(gcc_docdir)/include -I $(srcdir)/fortran -o $(@D) $<
......
gcc/java/ChangeLog
2006-06-06 Mike Stump <mrs@apple.com>
* Make-lang.in: Rename to htmldir to build_htmldir to avoid
installing during build.
2006-05-31 Thomas Fitzsimmons <fitzsim@redhat.com>
* gcj.texi (Extensions): Document the new gcj-dbtool-based
......
gcc/java/Make-lang.in
......@@ -177,7 +177,7 @@ java.srcinfo: doc/gcj.info
-cp -p $^ $(srcdir)/doc
java.dvi: doc/gcj.dvi
java.html: $(htmldir)/java/index.html
java.html: $(build_htmldir)/java/index.html
JAVA_MANFILES = doc/gcj.1 doc/gcjh.1 doc/jv-scan.1 doc/jcf-dump.1 doc/gij.1 \
doc/jv-convert.1 doc/grmic.1 doc/grmiregistry.1 \
doc/gcj-dbtool.1 doc/gjnih.1
......@@ -394,7 +394,7 @@ doc/gcj.info: $(TEXI_JAVA_FILES)
doc/gcj.dvi: $(TEXI_JAVA_FILES)
$(TEXI2DVI) -I $(abs_docdir)/include -o $@ $<
$(htmldir)/java/index.html: $(TEXI_JAVA_FILES)
$(build_htmldir)/java/index.html: $(TEXI_JAVA_FILES)
$(mkinstalldirs) $(@D)
rm -f $(@D)/*
$(TEXI2HTML) -I $(gcc_docdir)/include -I $(srcdir)/java -o $(@D) $<
......
gcc/treelang/ChangeLog
2006-06-06 Mike Stump <mrs@apple.com>
* Make-lang.in: Rename to gcc_htmldir to build_htmldir to avoid
installing during build.
2006-05-23 Carlos O'Donell <carlos@codesourcery.com>
* Make-lang.in: Rename htmldir to gcc_htmldir.
......
gcc/treelang/Make-lang.in
......@@ -173,9 +173,9 @@ doc/treelang.info: $(TEXI_TREELANG_FILES)
doc/treelang.dvi: $(TEXI_TREELANG_FILES)
$(TEXI2DVI) -I $(abs_docdir)/include -o $@ $<
treelang.html: $(gcc_htmldir)/treelang/index.html
treelang.html: $(build_htmldir)/treelang/index.html
$(gcc_htmldir)/treelang/index.html: $(TEXI_TREELANG_FILES)
$(build_htmldir)/treelang/index.html: $(TEXI_TREELANG_FILES)
$(mkinstalldirs) $(@D)
rm -f $(@D)/*
$(TEXI2HTML) -I $(gcc_docdir)/include -I $(srcdir)/treelang -o $(@D) $<
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment