summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4>2009-08-22 13:41:50 +0000
committerrwild <rwild@138bc75d-0d04-0410-961f-82ee72b054a4>2009-08-22 13:41:50 +0000
commit115d57c573871ce5eaf54d3fca7ef99b5628b630 (patch)
tree39111a2db2e981d7c6aeda673b9baa036f4f994d
parentcd9a469c7fa2f4be000e4e64f188cb820a332a1a (diff)
downloadgcc-115d57c573871ce5eaf54d3fca7ef99b5628b630.tar.gz
Cleanups after the update to Autoconf 2.64, Automake 1.11.
/: * configure.ac: Remove --with-datarootdir, --with-docdir, --with-pdfdir, --with-htmldir switches. * configure: Regenerate. gcc/: * configure.ac: Remove --with-datarootdir, --with-docdir, --with-htmldir switches. No need to call AC_SUBST for datarootdir, docdir, htmldir any more. * configure: Regenerate. * doc/install.texi (Configuration): Document --datarootdir, --docdir, --htmldir, --pdfdir; update documentation for --infodir, --mandir. (Prerequisites): Bump Autoconf version to 2.64, Automake to 1.11, M4 to 1.4.6. libgfortran/: * Makefile.am (install-html, install-pdf): Remove. * Makefile.in: Regenerate. libjava/classpath/: * doc/cp-hacking.texinfo (Needed Tools and Libraries): Bump Autoconf version to 2.64, Automake to 1.11, M4 to 1.4.6. libjava/: * HACKING: Use aclocal-1.11 and autoconf-2.64 in example. * Makefile.am (install-html, install-pdf): Remove. * Makefile.in: Regenerate. libstdc++-v3/: * doc/xml/manual/build_hacking.xml: Use tools from Autoconf 2.64 and Automake 1.11 in examples; update link to Autoconf manual page about quadrigraphs. * Makefile.am (install-html, install-pdf): Remove. * Makefile.in: Regenerate. libssp/: * Makefile.am (install-html, install-pdf): Remove. * Makefile.in: Regenerate. boehm-gc/: * Makefile.am (install-html, install-pdf): Remove. * Makefile.in: Regenerate. libmudflap/: * Makefile.am (install-html, install-pdf): Remove. * Makefile.in: Regenerate. zlib/: * Makefile.am (install-html, install-pdf, html): Remove. * Makefile.in: Regenerate. libffi/: * Makefile.am (install-html, install-pdf): Remove. * Makefile.in: Regenerate. libgomp/: * Makefile.am (install-html, install-pdf): Remove. * Makefile.in: Regenerate. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@151015 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--ChangeLog4
-rw-r--r--boehm-gc/ChangeLog3
-rw-r--r--boehm-gc/Makefile.am6
-rw-r--r--boehm-gc/Makefile.in9
-rwxr-xr-xconfigure50
-rw-r--r--configure.ac26
-rw-r--r--gcc/ChangeLog10
-rwxr-xr-xgcc/configure81
-rw-r--r--gcc/configure.ac23
-rw-r--r--gcc/doc/install.texi34
-rw-r--r--libffi/ChangeLog3
-rw-r--r--libffi/Makefile.am5
-rw-r--r--libffi/Makefile.in9
-rw-r--r--libgfortran/ChangeLog3
-rw-r--r--libgfortran/Makefile.am5
-rw-r--r--libgfortran/Makefile.in9
-rw-r--r--libgomp/ChangeLog3
-rw-r--r--libgomp/Makefile.am14
-rw-r--r--libgomp/Makefile.in18
-rw-r--r--libjava/ChangeLog4
-rw-r--r--libjava/HACKING6
-rw-r--r--libjava/Makefile.am5
-rw-r--r--libjava/Makefile.in9
-rw-r--r--libjava/classpath/ChangeLog3
-rw-r--r--libjava/classpath/doc/cp-hacking.texinfo6
-rw-r--r--libmudflap/ChangeLog3
-rw-r--r--libmudflap/Makefile.am5
-rw-r--r--libmudflap/Makefile.in9
-rw-r--r--libssp/ChangeLog3
-rw-r--r--libssp/Makefile.am5
-rw-r--r--libssp/Makefile.in9
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/Makefile.am4
-rw-r--r--libstdc++-v3/Makefile.in8
-rw-r--r--libstdc++-v3/doc/xml/manual/build_hacking.xml6
-rw-r--r--zlib/ChangeLog.gcj3
-rw-r--r--zlib/Makefile.am9
-rw-r--r--zlib/Makefile.in14
38 files changed, 140 insertions, 292 deletions
diff --git a/ChangeLog b/ChangeLog
index b00531a23ac..29ea7c9ab55 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+ * configure.ac: Remove --with-datarootdir, --with-docdir,
+ --with-pdfdir, --with-htmldir switches.
+ * configure: Regenerate.
+
* configure: Regenerate.
* compile: Sync from Automake 1.11.
diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog
index d0ec9537f74..1dfb6491be6 100644
--- a/boehm-gc/ChangeLog
+++ b/boehm-gc/ChangeLog
@@ -1,5 +1,8 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+ * Makefile.am (install-html, install-pdf): Remove.
+ * Makefile.in: Regenerate.
+
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* configure: Regenerate.
diff --git a/boehm-gc/Makefile.am b/boehm-gc/Makefile.am
index 83005b2e803..843891110c0 100644
--- a/boehm-gc/Makefile.am
+++ b/boehm-gc/Makefile.am
@@ -115,9 +115,3 @@ AM_MAKEFLAGS = \
CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
MAKEOVERRIDES=
-
-# No install-html or install-pdf support in automake yet
-.PHONY: install-html install-pdf
-install-html:
-install-pdf:
-
diff --git a/boehm-gc/Makefile.in b/boehm-gc/Makefile.in
index 425825961ff..70110d3e194 100644
--- a/boehm-gc/Makefile.in
+++ b/boehm-gc/Makefile.in
@@ -758,6 +758,8 @@ install-dvi-am:
install-exec-am: install-multi
+install-html: install-html-recursive
+
install-html-am:
install-info: install-info-recursive
@@ -766,6 +768,8 @@ install-info-am:
install-man:
+install-pdf: install-pdf-recursive
+
install-pdf-am:
install-ps: install-ps-recursive
@@ -823,11 +827,6 @@ uninstall-am:
.S.lo:
$(LTCOMPILE) -Wp,-P -x assembler-with-cpp -c $<
-# No install-html or install-pdf support in automake yet
-.PHONY: install-html install-pdf
-install-html:
-install-pdf:
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/configure b/configure
index 715915c6a63..0d149717b66 100755
--- a/configure
+++ b/configure
@@ -770,10 +770,6 @@ with_build_time_tools
enable_maintainer_mode
enable_stage1_checking
enable_werror
-with_datarootdir
-with_docdir
-with_pdfdir
-with_htmldir
'
ac_precious_vars='build_alias
host_alias
@@ -1500,10 +1496,6 @@ Optional Packages:
map A to B, C to D ... in debug information
--with-build-time-tools=PATH
use given path to find target tools during the build
- --with-datarootdir use datarootdir as the data root directory.
- --with-docdir install documentation in this directory.
- --with-pdfdir install pdf in this directory.
- --with-htmldir install html in this directory.
Some influential environment variables:
CC C compiler command
@@ -13187,48 +13179,6 @@ case ${enable_werror} in
esac
-# Flags needed to enable html installing and building
-
-# Check whether --with-datarootdir was given.
-if test "${with_datarootdir+set}" = set; then :
- withval=$with_datarootdir; datarootdir="\${prefix}/${withval}"
-else
- datarootdir="\${prefix}/share"
-fi
-
-
-
-# Check whether --with-docdir was given.
-if test "${with_docdir+set}" = set; then :
- withval=$with_docdir; docdir="\${prefix}/${withval}"
-else
- docdir="\${datarootdir}/doc"
-fi
-
-
-
-# Check whether --with-pdfdir was given.
-if test "${with_pdfdir+set}" = set; then :
- withval=$with_pdfdir; pdfdir="\${prefix}/${withval}"
-else
- pdfdir="\${docdir}"
-fi
-
-
-
-# Check whether --with-htmldir was given.
-if test "${with_htmldir+set}" = set; then :
- withval=$with_htmldir; htmldir="\${prefix}/${withval}"
-else
- htmldir="\${docdir}"
-fi
-
-
-
-
-
-
-
# Specify what files to not compare during bootstrap.
compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*"
diff --git a/configure.ac b/configure.ac
index 9da0048969a..ad2c86a5a25 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3120,32 +3120,6 @@ case ${enable_werror} in
esac
AC_SUBST(stage2_werror_flag)
-# Flags needed to enable html installing and building
-AC_ARG_WITH(datarootdir,
-[ --with-datarootdir use datarootdir as the data root directory.],
-[datarootdir="\${prefix}/${withval}"],
-[datarootdir="\${prefix}/share"])
-
-AC_ARG_WITH(docdir,
-[ --with-docdir install documentation in this directory.],
-[docdir="\${prefix}/${withval}"],
-[docdir="\${datarootdir}/doc"])
-
-AC_ARG_WITH(pdfdir,
-[ --with-pdfdir install pdf in this directory.],
-[pdfdir="\${prefix}/${withval}"],
-[pdfdir="\${docdir}"])
-
-AC_ARG_WITH(htmldir,
-[ --with-htmldir install html in this directory.],
-[htmldir="\${prefix}/${withval}"],
-[htmldir="\${docdir}"])
-
-AC_SUBST(datarootdir)
-AC_SUBST(docdir)
-AC_SUBST(pdfdir)
-AC_SUBST(htmldir)
-
# Specify what files to not compare during bootstrap.
compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*"
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index d23a59f1e4e..d3a64410e00 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,5 +1,15 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+ * configure.ac: Remove --with-datarootdir, --with-docdir,
+ --with-htmldir switches. No need to call AC_SUBST for
+ datarootdir, docdir, htmldir any more.
+ * configure: Regenerate.
+ * doc/install.texi (Configuration): Document --datarootdir,
+ --docdir, --htmldir, --pdfdir; update documentation for
+ --infodir, --mandir.
+ (Prerequisites): Bump Autoconf version to 2.64, Automake to
+ 1.11, M4 to 1.4.6.
+
* aclocal.m4: Regenerate.
* config.in: Regenerate.
* configure: Regenerate.
diff --git a/gcc/configure b/gcc/configure
index f932bbbb289..429d3be8e94 100755
--- a/gcc/configure
+++ b/gcc/configure
@@ -1041,9 +1041,6 @@ with_system_zlib
enable_maintainer_mode
enable_version_specific_runtime_libs
with_slibdir
-with_datarootdir
-with_docdir
-with_htmldir
enable_plugin
'
ac_precious_vars='build_alias
@@ -1783,9 +1780,6 @@ Optional Packages:
with the compiler
--with-system-zlib use installed libz
--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
@@ -6586,11 +6580,6 @@ else
fi
-# Used by documentation targets
-
-
-
-
# Check whether --with-multilib-list was given.
if test "${with_multilib_list+set}" = set; then :
@@ -11089,13 +11078,13 @@ if test "${lt_cv_nm_interface+set}" = set; then :
else
lt_cv_nm_interface="BSD nm"
echo "int some_variable = 0;" > conftest.$ac_ext
- (eval echo "\"\$as_me:11092: $ac_compile\"" >&5)
+ (eval echo "\"\$as_me:11081: $ac_compile\"" >&5)
(eval "$ac_compile" 2>conftest.err)
cat conftest.err >&5
- (eval echo "\"\$as_me:11095: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+ (eval echo "\"\$as_me:11084: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
(eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
cat conftest.err >&5
- (eval echo "\"\$as_me:11098: output\"" >&5)
+ (eval echo "\"\$as_me:11087: output\"" >&5)
cat conftest.out >&5
if $GREP 'External.*some_variable' conftest.out > /dev/null; then
lt_cv_nm_interface="MS dumpbin"
@@ -12300,7 +12289,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 12303 "configure"' > conftest.$ac_ext
+ echo '#line 12292 "configure"' > conftest.$ac_ext
if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -13960,11 +13949,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:13963: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13952: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:13967: \$? = $ac_status" >&5
+ echo "$as_me:13956: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14299,11 +14288,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14302: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14291: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14306: \$? = $ac_status" >&5
+ echo "$as_me:14295: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14404,11 +14393,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14407: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14396: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14411: \$? = $ac_status" >&5
+ echo "$as_me:14400: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -14459,11 +14448,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14462: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:14451: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14466: \$? = $ac_status" >&5
+ echo "$as_me:14455: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16841,7 +16830,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 16844 "configure"
+#line 16833 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -16937,7 +16926,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 16940 "configure"
+#line 16929 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18893,11 +18882,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18896: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18885: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18900: \$? = $ac_status" >&5
+ echo "$as_me:18889: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18992,11 +18981,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18995: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18984: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18999: \$? = $ac_status" >&5
+ echo "$as_me:18988: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -19044,11 +19033,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:19047: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:19036: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:19051: \$? = $ac_status" >&5
+ echo "$as_me:19040: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -24234,36 +24223,6 @@ fi
-
-# Check whether --with-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 was given.
-if test "${with_docdir+set}" = set; then :
- withval=$with_docdir; docdir="\${prefix}/$with_docdir"
-else
- docdir='$(datarootdir)'
-fi
-
-
-
-
-# Check whether --with-htmldir was given.
-if test "${with_htmldir+set}" = set; then :
- withval=$with_htmldir; htmldir="\${prefix}/$with_htmldir"
-else
- htmldir='$(docdir)'
-fi
-
-
-
# Substitute configuration variables
diff --git a/gcc/configure.ac b/gcc/configure.ac
index c068cf9aeba..b08e297f52d 100644
--- a/gcc/configure.ac
+++ b/gcc/configure.ac
@@ -819,11 +819,6 @@ AC_ARG_ENABLE(languages,
esac],
[enable_languages=c])
-# Used by documentation targets
-AC_SUBST(datarootdir)
-AC_SUBST(docdir)
-AC_SUBST(htmldir)
-
AC_ARG_WITH(multilib-list,
[ --with-multilib-list Select multilibs (SH only)],
:,
@@ -4024,24 +4019,6 @@ else
fi)
AC_SUBST(slibdir)
-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)
diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi
index 739e929ed7b..9c120b8e94a 100644
--- a/gcc/doc/install.texi
+++ b/gcc/doc/install.texi
@@ -360,13 +360,13 @@ together with GCC@.
@heading Tools/packages necessary for modifying GCC
@table @asis
-@item autoconf version 2.59
-@itemx GNU m4 version 1.4 (or later)
+@item autoconf version 2.64
+@itemx GNU m4 version 1.4.6 (or later)
Necessary when modifying @file{configure.ac}, @file{aclocal.m4}, etc.@:
to regenerate @file{configure} and @file{config.in} files.
-@item automake version 1.9.6
+@item automake version 1.11
Necessary when modifying a @file{Makefile.am} file to regenerate its
associated @file{Makefile.in}.
@@ -377,8 +377,8 @@ file. Specifically this applies to the @file{gcc}, @file{intl},
as any of their subdirectories.
For directories that use automake, GCC requires the latest release in
-the 1.9.x series, which is currently 1.9.6. When regenerating a directory
-to a newer version, please update all the directories using an older 1.9.x
+the 1.11 series, which is currently 1.11. When regenerating a directory
+to a newer version, please update all the directories using an older 1.11
to the latest released version.
@item gettext version 0.14.5 (or later)
@@ -714,18 +714,34 @@ The default is @file{@var{exec-prefix}/libexec}.
Specify the installation directory for the shared libgcc library. The
default is @file{@var{libdir}}.
+@item --datarootdir=@var{dirname}
+Specify the root of the directory tree for read-only architecture-independent
+data files referenced by GCC@. The default is @file{@var{prefix}/share}.
+
@item --infodir=@var{dirname}
Specify the installation directory for documentation in info format.
-The default is @file{@var{prefix}/info}.
+The default is @file{@var{datarootdir}/info}.
@item --datadir=@var{dirname}
Specify the installation directory for some architecture-independent
-data files referenced by GCC@. The default is @file{@var{prefix}/share}.
+data files referenced by GCC@. The default is @file{@var{datarootdir}}.
+
+@item --docdir=@var{dirname}
+Specify the installation directory for documentation files (other
+than Info) for GCC@. The default is @file{@var{datarootdir}/doc}.
+
+@item --htmldir=@var{dirname}
+Specify the installation directory for HTML documentation files.
+The default is @file{@var{docdir}}.
+
+@item --pdfdir=@var{dirname}
+Specify the installation directory for PDF documentation files.
+The default is @file{@var{docdir}}.
@item --mandir=@var{dirname}
Specify the installation directory for manual pages. The default is
-@file{@var{prefix}/man}. (Note that the manual pages are only extracts from
-the full GCC manuals, which are provided in Texinfo format. The manpages
+@file{@var{datarootdir}/man}. (Note that the manual pages are only extracts
+from the full GCC manuals, which are provided in Texinfo format. The manpages
are derived by an automatic conversion process from parts of the full
manual.)
diff --git a/libffi/ChangeLog b/libffi/ChangeLog
index 7d38ea3d2cc..a8a5481068a 100644
--- a/libffi/ChangeLog
+++ b/libffi/ChangeLog
@@ -1,5 +1,8 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+ * Makefile.am (install-html, install-pdf): Remove.
+ * Makefile.in: Regenerate.
+
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* configure: Regenerate.
diff --git a/libffi/Makefile.am b/libffi/Makefile.am
index 9705c8f4a9e..74d45d43e82 100644
--- a/libffi/Makefile.am
+++ b/libffi/Makefile.am
@@ -169,11 +169,6 @@ libffi_la_LDFLAGS = -version-info `grep -v '^\#' $(srcdir)/libtool-version` $(LT
AM_CPPFLAGS = -I. -I$(top_srcdir)/include -Iinclude -I$(top_srcdir)/src
AM_CCASFLAGS = $(AM_CPPFLAGS)
-# No install-html or install-pdf support in automake yet
-.PHONY: install-html install-pdf
-install-html:
-install-pdf:
-
# Multilib support. Automake should provide these on its own.
all-recursive: all-multi
install-recursive: install-multi
diff --git a/libffi/Makefile.in b/libffi/Makefile.in
index 44fb14c25ca..029a3209e14 100644
--- a/libffi/Makefile.in
+++ b/libffi/Makefile.in
@@ -1434,6 +1434,8 @@ install-dvi-am:
install-exec-am: install-multi install-toolexeclibLTLIBRARIES
+install-html: install-html-recursive
+
install-html-am:
install-info: install-info-recursive
@@ -1442,6 +1444,8 @@ install-info-am:
install-man:
+install-pdf: install-pdf-recursive
+
install-pdf-am:
install-ps: install-ps-recursive
@@ -1499,11 +1503,6 @@ uninstall-am: uninstall-toolexeclibLTLIBRARIES
uninstall uninstall-am uninstall-toolexeclibLTLIBRARIES
-# No install-html or install-pdf support in automake yet
-.PHONY: install-html install-pdf
-install-html:
-install-pdf:
-
# Multilib support. Automake should provide these on its own.
all-recursive: all-multi
install-recursive: install-multi
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 3e1320f66e6..18c1b2b5334 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,5 +1,8 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+ * Makefile.am (install-html, install-pdf): Remove.
+ * Makefile.in: Regenerate.
+
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
diff --git a/libgfortran/Makefile.am b/libgfortran/Makefile.am
index 7127d665dd5..08609557ce6 100644
--- a/libgfortran/Makefile.am
+++ b/libgfortran/Makefile.am
@@ -722,11 +722,6 @@ $(gfor_misc_specifics) \
intrinsics/dprod_r8.f90 \
intrinsics/f2c_specifics.F90
-# No install-html or install-pdf support in automake yet
-.PHONY: install-html install-pdf
-install-html:
-install-pdf:
-
# Turn on vectorization and loop unrolling for matmul.
$(patsubst %.c,%.lo,$(notdir $(i_matmul_c))): AM_CFLAGS += -ftree-vectorize -funroll-loops
# Logical matmul doesn't vectorize.
diff --git a/libgfortran/Makefile.in b/libgfortran/Makefile.in
index 5904583fe66..1bcae42d52d 100644
--- a/libgfortran/Makefile.in
+++ b/libgfortran/Makefile.in
@@ -6060,6 +6060,8 @@ install-dvi-am:
install-exec-am: install-multi install-myexeclibLTLIBRARIES \
install-toolexeclibLTLIBRARIES
+install-html: install-html-am
+
install-html-am:
install-info: install-info-am
@@ -6068,6 +6070,8 @@ install-info-am:
install-man:
+install-pdf: install-pdf-am
+
install-pdf-am:
install-ps: install-ps-am
@@ -6126,11 +6130,6 @@ uninstall-am: uninstall-myexeclibLTLIBRARIES \
uninstall-toolexeclibLTLIBRARIES
-# No install-html or install-pdf support in automake yet
-.PHONY: install-html install-pdf
-install-html:
-install-pdf:
-
# Turn on vectorization and loop unrolling for matmul.
$(patsubst %.c,%.lo,$(notdir $(i_matmul_c))): AM_CFLAGS += -ftree-vectorize -funroll-loops
# Logical matmul doesn't vectorize.
diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog
index 4a610dd3beb..93908d797b4 100644
--- a/libgomp/ChangeLog
+++ b/libgomp/ChangeLog
@@ -1,5 +1,8 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+ * Makefile.am (install-html, install-pdf): Remove.
+ * Makefile.in: Regenerate.
+
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
diff --git a/libgomp/Makefile.am b/libgomp/Makefile.am
index 2ef2f7ec93b..5bc0732c01f 100644
--- a/libgomp/Makefile.am
+++ b/libgomp/Makefile.am
@@ -56,20 +56,6 @@ env.lo: libgomp_f.h
env.o: libgomp_f.h
-# No install-html or install-pdf support in automake yet
-.PHONY: install-html install-pdf
-install-html:
-
-install-pdf: $(PDFS)
- @$(NORMAL_INSTALL)
- test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)"
- @list='$(PDFS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
- done
-
# Automake Documentation:
# If your package has Texinfo files in many directories, you can use the
# variable TEXINFO_TEX to tell Automake where to find the canonical
diff --git a/libgomp/Makefile.in b/libgomp/Makefile.in
index 01a43727130..d5b9c474904 100644
--- a/libgomp/Makefile.in
+++ b/libgomp/Makefile.in
@@ -1133,6 +1133,8 @@ install-dvi-am: $(DVIS)
install-exec-am: install-multi install-nodist_toolexeclibHEADERS \
install-toolexeclibLTLIBRARIES
+install-html: install-html-recursive
+
install-html-am: $(HTMLS)
@$(NORMAL_INSTALL)
test -z "$(htmldir)" || $(MKDIR_P) "$(DESTDIR)$(htmldir)"
@@ -1189,6 +1191,8 @@ install-info-am: $(INFO_DEPS)
else : ; fi
install-man:
+install-pdf: install-pdf-recursive
+
install-pdf-am: $(PDFS)
@$(NORMAL_INSTALL)
test -z "$(pdfdir)" || $(MKDIR_P) "$(DESTDIR)$(pdfdir)"
@@ -1288,20 +1292,6 @@ fortran.o: libgomp_f.h
env.lo: libgomp_f.h
env.o: libgomp_f.h
-# No install-html or install-pdf support in automake yet
-.PHONY: install-html install-pdf
-install-html:
-
-install-pdf: $(PDFS)
- @$(NORMAL_INSTALL)
- test -z "$(pdfdir)" || $(mkinstalldirs) "$(DESTDIR)$(pdfdir)"
- @list='$(PDFS)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(INSTALL_DATA) '$$d$$p' '$(DESTDIR)$(pdfdir)/$$f'"; \
- $(INSTALL_DATA) "$$d$$p" "$(DESTDIR)$(pdfdir)/$$f"; \
- done
-
all-local: $(STAMP_GENINSRC)
stamp-geninsrc: libgomp.info
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index 85568f02d3c..a13ddf6e02f 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,5 +1,9 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+ * HACKING: Use aclocal-1.11 and autoconf-2.64 in example.
+ * Makefile.am (install-html, install-pdf): Remove.
+ * Makefile.in: Regenerate.
+
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* configure: Regenerate.
diff --git a/libjava/HACKING b/libjava/HACKING
index ba85b697be2..fa38027db3e 100644
--- a/libjava/HACKING
+++ b/libjava/HACKING
@@ -41,9 +41,9 @@ this can be done using these commands:
cd libjava &&
rm -f aclocal.m4 &&
ACFLAGS=$(grep "^ACLOCAL_AMFLAGS" Makefile.in | sed -e "s/ACLOCAL_AMFLAGS[ \t ]*=//") &&
- aclocal-1.9 $ACFLAGS &&
+ aclocal-1.11 $ACFLAGS &&
rm -f configure &&
- autoconf-2.59 &&
+ autoconf-2.64 &&
rm -fr autom4te.cache
See the GCC documentation which auto* versions to use.
@@ -91,7 +91,7 @@ To import a new release:
in the classpath/ChangeLog.gcj file.
(Don't forget to svn resolved files.)
- Use auto* to create configure, Makefile.in, etc
- Make sure you have Automake 1.9.6 installed. Exactly that version!
+ Make sure you have Automake 1.11 installed. Exactly that version!
You have to make sure to use the gcc libtool.m4 and gcc lt* scripts
cd .../classpath
cp ../../lt* .
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index 352951afced..13b25ac7ea6 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -1326,11 +1326,6 @@ CONFIG_STATUS_DEPENDENCIES = $(srcdir)/configure.host
MAKEOVERRIDES=
-# No install-html or install-pdf support in automake yet
-.PHONY: install-html install-pdf
-install-html:
-install-pdf:
-
# Multilib support variables.
MULTISRCTOP =
MULTIBUILDTOP =
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 44962f05cc0..9608e7941df 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -10535,6 +10535,8 @@ install-exec-am: install-binPROGRAMS install-binSCRIPTS \
install-toolexeclibLTLIBRARIES install-toolexecmainlibDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-exec-hook
+install-html: install-html-recursive
+
install-html-am:
install-info: install-info-recursive
@@ -10543,6 +10545,8 @@ install-info-am:
install-man:
+install-pdf: install-pdf-recursive
+
install-pdf-am:
install-ps: install-ps-recursive
@@ -12773,11 +12777,6 @@ $(libgcj_la_OBJECTS) $(gcj_dbtool_OBJECTS) $(xlib_nat_files): headers.stamp
$(libgij_la_OBJECTS): headers.stamp
$(libjvm_la_OBJECTS): headers.stamp
-# No install-html or install-pdf support in automake yet
-.PHONY: install-html install-pdf
-install-html:
-install-pdf:
-
# Multilib support.
.PHONY: all-multi mostlyclean-multi clean-multi distclean-multi \
maintainer-clean-multi
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog
index 1cbeda168ff..85ef11f2c25 100644
--- a/libjava/classpath/ChangeLog
+++ b/libjava/classpath/ChangeLog
@@ -1,5 +1,8 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+ * doc/cp-hacking.texinfo (Needed Tools and Libraries): Bump
+ Autoconf version to 2.64, Automake to 1.11, M4 to 1.4.6.
+
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* configure: Regenerate.
diff --git a/libjava/classpath/doc/cp-hacking.texinfo b/libjava/classpath/doc/cp-hacking.texinfo
index 829b0e40e81..a424b56ec76 100644
--- a/libjava/classpath/doc/cp-hacking.texinfo
+++ b/libjava/classpath/doc/cp-hacking.texinfo
@@ -351,13 +351,13 @@ Eclipse Compiler for Java 3.1+
@item
CVS 1.11+
@item
-automake 1.9+
+automake 1.11+
@item
-autoconf 2.59+
+autoconf 2.64+
@item
libtool 1.5+
@item
-GNU m4 1.4
+GNU m4 1.4.6
@item
texinfo 4.2+
@end itemize
diff --git a/libmudflap/ChangeLog b/libmudflap/ChangeLog
index 1f1beadf212..5dd8ab5cea1 100644
--- a/libmudflap/ChangeLog
+++ b/libmudflap/ChangeLog
@@ -1,5 +1,8 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+ * Makefile.am (install-html, install-pdf): Remove.
+ * Makefile.in: Regenerate.
+
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
diff --git a/libmudflap/Makefile.am b/libmudflap/Makefile.am
index d326d8876c8..29091dee9ff 100644
--- a/libmudflap/Makefile.am
+++ b/libmudflap/Makefile.am
@@ -94,10 +94,5 @@ AM_MAKEFLAGS = \
MAKEOVERRIDES=
-# No install-html or install-pdf support in automake yet
-.PHONY: install-html install-pdf
-install-html:
-install-pdf:
-
## ################################################################
diff --git a/libmudflap/Makefile.in b/libmudflap/Makefile.in
index edbe1ed9dce..bf53dc43f22 100644
--- a/libmudflap/Makefile.in
+++ b/libmudflap/Makefile.in
@@ -965,6 +965,8 @@ install-dvi-am:
install-exec-am: install-multi install-toolexeclibLTLIBRARIES
+install-html: install-html-recursive
+
install-html-am:
install-info: install-info-recursive
@@ -973,6 +975,8 @@ install-info-am:
install-man:
+install-pdf: install-pdf-recursive
+
install-pdf-am:
install-ps: install-ps-recursive
@@ -1032,11 +1036,6 @@ uninstall-am: uninstall-nobase_libsubincludeHEADERS \
uninstall-toolexeclibLTLIBRARIES
-# No install-html or install-pdf support in automake yet
-.PHONY: install-html install-pdf
-install-html:
-install-pdf:
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/libssp/ChangeLog b/libssp/ChangeLog
index bcd3d72f7b4..3d0fe806da6 100644
--- a/libssp/ChangeLog
+++ b/libssp/ChangeLog
@@ -1,5 +1,8 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+ * Makefile.am (install-html, install-pdf): Remove.
+ * Makefile.in: Regenerate.
+
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* config.h.in: Regenerate.
diff --git a/libssp/Makefile.am b/libssp/Makefile.am
index 2c5800ae25c..7b6e9465084 100644
--- a/libssp/Makefile.am
+++ b/libssp/Makefile.am
@@ -90,10 +90,5 @@ AM_MAKEFLAGS = \
MAKEOVERRIDES=
-# No install-html or install-pdf support in automake yet
-.PHONY: install-html install-pdf
-install-html:
-install-pdf:
-
## ################################################################
diff --git a/libssp/Makefile.in b/libssp/Makefile.in
index 26367ef0b16..543e2b6b3a8 100644
--- a/libssp/Makefile.in
+++ b/libssp/Makefile.in
@@ -791,6 +791,8 @@ install-dvi-am:
install-exec-am: install-multi install-toolexeclibLTLIBRARIES
+install-html: install-html-am
+
install-html-am:
install-info: install-info-am
@@ -799,6 +801,8 @@ install-info-am:
install-man:
+install-pdf: install-pdf-am
+
install-pdf-am:
install-ps: install-ps-am
@@ -856,11 +860,6 @@ uninstall-am: uninstall-nobase_libsubincludeHEADERS \
uninstall-toolexeclibLTLIBRARIES
-# No install-html or install-pdf support in automake yet
-.PHONY: install-html install-pdf
-install-html:
-install-pdf:
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index c3326d9bdd7..5d8561b1ba0 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,5 +1,11 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+ * doc/xml/manual/build_hacking.xml: Use tools from Autoconf
+ 2.64 and Automake 1.11 in examples; update link to Autoconf
+ manual page about quadrigraphs.
+ * Makefile.am (install-html, install-pdf): Remove.
+ * Makefile.in: Regenerate.
+
* Makefile.in: Regenerate.
* acinclude.m4: Regenerate.
* aclocal.m4: Regenerate.
diff --git a/libstdc++-v3/Makefile.am b/libstdc++-v3/Makefile.am
index 1f8d3159bc7..c7a22aaa33c 100644
--- a/libstdc++-v3/Makefile.am
+++ b/libstdc++-v3/Makefile.am
@@ -89,7 +89,3 @@ AM_MAKEFLAGS = \
# Subdir rules rely on $(FLAGS_TO_PASS)
FLAGS_TO_PASS = $(AM_MAKEFLAGS)
-
-.PHONY: install-html install-pdf
-install-html:
-install-pdf:
diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in
index bc6dcc7bcb6..77a48665bf0 100644
--- a/libstdc++-v3/Makefile.in
+++ b/libstdc++-v3/Makefile.in
@@ -795,6 +795,8 @@ install-dvi-am:
install-exec-am: install-multi
+install-html: install-html-recursive
+
install-html-am:
install-info: install-info-recursive
@@ -803,6 +805,8 @@ install-info-am:
install-man:
+install-pdf: install-pdf-recursive
+
install-pdf-am:
install-ps: install-ps-recursive
@@ -866,10 +870,6 @@ doc-%:
# automake-generated TAGS rule. Make a simple one here.
TAGS: tags-recursive $(LISP)
-.PHONY: install-html install-pdf
-install-html:
-install-pdf:
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT:
diff --git a/libstdc++-v3/doc/xml/manual/build_hacking.xml b/libstdc++-v3/doc/xml/manual/build_hacking.xml
index e5ca0cb2ec7..bfec8604b27 100644
--- a/libstdc++-v3/doc/xml/manual/build_hacking.xml
+++ b/libstdc++-v3/doc/xml/manual/build_hacking.xml
@@ -58,8 +58,8 @@
Regenerate all generated files by using the command sequence
<code>"autoreconf"</code> at the top level of the libstdc++ source
directory. The following will also work, but is much more complex:
- <code>"aclocal-1.7 &amp;&amp; autoconf-2.59 &amp;&amp;
- autoheader-2.59 &amp;&amp; automake-1.7"</code> The version
+ <code>"aclocal-1.11 &amp;&amp; autoconf-2.64 &amp;&amp;
+ autoheader-2.64 &amp;&amp; automake-1.11"</code> The version
numbers may be absent entirely or otherwise vary depending on
<ulink url="http://gcc.gnu.org/install/prerequisites.html">the
current requirements</ulink> and your vendor's choice of
@@ -305,7 +305,7 @@
If you're wondering what that line noise in the last example was,
that's how you embed autoconf special characters in output text.
They're called <ulink
- url="http://ftp.gnu.org/pub/old-gnu/Manuals/autoconf-2.57/html_mono/autoconf.html#SEC95"><emphasis>quadrigraphs</emphasis></ulink>
+ url="http://www.gnu.org/software/autoconf/manual/autoconf.html#Quadrigraphs"><emphasis>quadrigraphs</emphasis></ulink>
and you should use them whenever necessary.
</para>
</listitem>
diff --git a/zlib/ChangeLog.gcj b/zlib/ChangeLog.gcj
index 266f04ab35f..ffc3b6f205b 100644
--- a/zlib/ChangeLog.gcj
+++ b/zlib/ChangeLog.gcj
@@ -1,5 +1,8 @@
2009-08-22 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
+ * Makefile.am (install-html, install-pdf, html): Remove.
+ * Makefile.in: Regenerate.
+
* Makefile.in: Regenerate.
* aclocal.m4: Regenerate.
* configure: Regenerate.
diff --git a/zlib/Makefile.am b/zlib/Makefile.am
index 749a13c7fda..55418e497a9 100644
--- a/zlib/Makefile.am
+++ b/zlib/Makefile.am
@@ -58,12 +58,3 @@ AM_MAKEFLAGS = \
"PICFLAG=$(PICFLAG)" \
"RANLIB=$(RANLIB)" \
"DESTDIR=$(DESTDIR)"
-
-# No html support.
-# No install-html or install-pdf support in automake yet
-.PHONY: html install-html install-pdf
-
-html:
-install-html:
-install-pdf:
-
diff --git a/zlib/Makefile.in b/zlib/Makefile.in
index 393427fce1d..b9067c3c8fa 100644
--- a/zlib/Makefile.in
+++ b/zlib/Makefile.in
@@ -593,6 +593,8 @@ dvi: dvi-am
dvi-am:
+html: html-am
+
html-am:
info: info-am
@@ -607,6 +609,8 @@ install-dvi-am:
install-exec-am: install-multi install-toolexeclibLIBRARIES
+install-html: install-html-am
+
install-html-am:
install-info: install-info-am
@@ -615,6 +619,8 @@ install-info-am:
install-man:
+install-pdf: install-pdf-am
+
install-pdf-am:
install-ps: install-ps-am
@@ -665,14 +671,6 @@ uninstall-am: uninstall-toolexeclibLIBRARIES
uninstall-toolexeclibLIBRARIES
-# No html support.
-# No install-html or install-pdf support in automake yet
-.PHONY: html install-html install-pdf
-
-html:
-install-html:
-install-pdf:
-
# Tell versions [3.59,3.63) of GNU make to not export all variables.
# Otherwise a system limit (for SysV at least) may be exceeded.
.NOEXPORT: