Skip to content

Commit 84acd4c

Browse files
Ralf WildenhuesRalf Wildenhues
Ralf Wildenhues
authored and
Ralf Wildenhues
committed
Cleanups after the update to Autoconf 2.64, Automake 1.11.
/: * README-maintainer-mode: Point directly to upstream locations for autoconf, automake, libtool, gettext, instead of copies on sources.redhat.com. Document required versions. * configure.ac: Do not substitute datarootdir, htmldir, pdfdir, docdir. Do not process --with-datarootdir, --with-htmldir, --with-pdfdir, --with-docdir. * configure: Regenerate. gdb/: * CONTRIBUTE: Bump documented Autoconf version. * configure.ac: Do not substitute datarootdir, htmldir, pdfdir, docdir. Do not process --with-datarootdir, --with-htmldir, --with-pdfdir, --with-docdir. * configure: Regenerate. gdb/doc/: * gdbint.texinfo (Releasing GDB): Point to README-maintainer-mode file for required autoconf version. * configure.ac: Do not substitute datarootdir, htmldir, pdfdir, docdir. Do not process --with-datarootdir, --with-htmldir, --with-pdfdir, --with-docdir. * configure: Regenerate. gprof/: * Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am) (install-pdf-recursive, html__strip_dir, install-html) (install-html-am, install-html-recursive): Remove. * Makefile.in: Regenerate. opcodes/: * Makefile.am (install-pdf, install-html): Remove. * Makefile.in: Regenerate. gas/: * Makefile.am (install-pdf, install-pdf-recursive, install-html) (install-html-recursive): Remove. * Makefile.in: Regenerate. * doc/Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am) (html__strip_dir, install-html, install-html-am): Remove. * doc/Makefile.in: Regenerate. ld/: * Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am) (install-pdf-recursive, html__strip_dir, install-html) (install-html-am, install-html-recursive): Remove. * Makefile.in: Regenerate. binutils/: * Makefile.am (install-pdf, install-pdf-recursive, install-html) (install-html-recursive): Remove. * Makefile.in: Regenerate. * doc/Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am) (html__strip_dir, install-html, install-html-am): Remove. * doc/Makefile.in: Regenerate. bfd/: * Makefile.am (datarootdir, docdir, htmldor, pdfdir) (install-pdf, install-pdf-recursive, install-html) (install-html-recursive): Remove. * Makefile.in: Regenerate. bfd/doc/: * Makefile.am (pdf__strip_dir, install-pdf, install-pdf-am) (html__strip_dir, install-html, install-html-am): Remove. * Makefile.in: Regenerate.
1 parent efd58f0 commit 84acd4c

File tree

4 files changed

+20
-77
lines changed

4 files changed

+20
-77
lines changed

ChangeLog

+8
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,13 @@
11
2009-08-22 Ralf Wildenhues <[email protected]>
22

3+
* README-maintainer-mode: Point directly to upstream locations
4+
for autoconf, automake, libtool, gettext, instead of copies on
5+
sources.redhat.com. Document required versions.
6+
* configure.ac: Do not substitute datarootdir, htmldir,
7+
pdfdir, docdir. Do not process --with-datarootdir,
8+
--with-htmldir, --with-pdfdir, --with-docdir.
9+
* configure: Regenerate.
10+
311
* configure: Regenerate.
412

513
* compile: Sync from Automake 1.11.

README-maintainer-mode

+12-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,18 @@
33

44
Note that if you configure with --enable-maintainer-mode, you will need
55
special versions of automake, autoconf, libtool and gettext. You will
6-
find the sources for these in ftp://sources.redhat.com/pub/binutils.
6+
find the sources for these in the respective upstream directories:
7+
8+
ftp://ftp.gnu.org/gnu/autoconf
9+
ftp://ftp.gnu.org/gnu/automake
10+
ftp://ftp.gnu.org/gnu/libtool
11+
ftp://ftp.gnu.org/gnu/gettext
12+
13+
The required versions of the tools for this tree are
14+
autoconf 2.64
15+
automake 1.11
16+
libtool 2.2.6
17+
gettext 0.14.5
718

819
Note - "make distclean" does not work with maintainer mode enabled.
920
The Makefiles in the some of the po/ subdirectories depend upon the

configure

-50
Original file line numberDiff line numberDiff line change
@@ -770,10 +770,6 @@ with_build_time_tools
770770
enable_maintainer_mode
771771
enable_stage1_checking
772772
enable_werror
773-
with_datarootdir
774-
with_docdir
775-
with_pdfdir
776-
with_htmldir
777773
'
778774
ac_precious_vars='build_alias
779775
host_alias
@@ -1500,10 +1496,6 @@ Optional Packages:
15001496
map A to B, C to D ... in debug information
15011497
--with-build-time-tools=PATH
15021498
use given path to find target tools during the build
1503-
--with-datarootdir use datarootdir as the data root directory.
1504-
--with-docdir install documentation in this directory.
1505-
--with-pdfdir install pdf in this directory.
1506-
--with-htmldir install html in this directory.
15071499
15081500
Some influential environment variables:
15091501
CC C compiler command
@@ -13187,48 +13179,6 @@ case ${enable_werror} in
1318713179
esac
1318813180
1318913181
13190-
# Flags needed to enable html installing and building
13191-
13192-
# Check whether --with-datarootdir was given.
13193-
if test "${with_datarootdir+set}" = set; then :
13194-
withval=$with_datarootdir; datarootdir="\${prefix}/${withval}"
13195-
else
13196-
datarootdir="\${prefix}/share"
13197-
fi
13198-
13199-
13200-
13201-
# Check whether --with-docdir was given.
13202-
if test "${with_docdir+set}" = set; then :
13203-
withval=$with_docdir; docdir="\${prefix}/${withval}"
13204-
else
13205-
docdir="\${datarootdir}/doc"
13206-
fi
13207-
13208-
13209-
13210-
# Check whether --with-pdfdir was given.
13211-
if test "${with_pdfdir+set}" = set; then :
13212-
withval=$with_pdfdir; pdfdir="\${prefix}/${withval}"
13213-
else
13214-
pdfdir="\${docdir}"
13215-
fi
13216-
13217-
13218-
13219-
# Check whether --with-htmldir was given.
13220-
if test "${with_htmldir+set}" = set; then :
13221-
withval=$with_htmldir; htmldir="\${prefix}/${withval}"
13222-
else
13223-
htmldir="\${docdir}"
13224-
fi
13225-
13226-
13227-
13228-
13229-
13230-
13231-
1323213182
# Specify what files to not compare during bootstrap.
1323313183
1323413184
compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*"

configure.ac

-26
Original file line numberDiff line numberDiff line change
@@ -3120,32 +3120,6 @@ case ${enable_werror} in
31203120
esac
31213121
AC_SUBST(stage2_werror_flag)
31223122

3123-
# Flags needed to enable html installing and building
3124-
AC_ARG_WITH(datarootdir,
3125-
[ --with-datarootdir use datarootdir as the data root directory.],
3126-
[datarootdir="\${prefix}/${withval}"],
3127-
[datarootdir="\${prefix}/share"])
3128-
3129-
AC_ARG_WITH(docdir,
3130-
[ --with-docdir install documentation in this directory.],
3131-
[docdir="\${prefix}/${withval}"],
3132-
[docdir="\${datarootdir}/doc"])
3133-
3134-
AC_ARG_WITH(pdfdir,
3135-
[ --with-pdfdir install pdf in this directory.],
3136-
[pdfdir="\${prefix}/${withval}"],
3137-
[pdfdir="\${docdir}"])
3138-
3139-
AC_ARG_WITH(htmldir,
3140-
[ --with-htmldir install html in this directory.],
3141-
[htmldir="\${prefix}/${withval}"],
3142-
[htmldir="\${docdir}"])
3143-
3144-
AC_SUBST(datarootdir)
3145-
AC_SUBST(docdir)
3146-
AC_SUBST(pdfdir)
3147-
AC_SUBST(htmldir)
3148-
31493123
# Specify what files to not compare during bootstrap.
31503124

31513125
compare_exclusions="gcc/cc*-checksum\$(objext) | gcc/ada/*tools/*"

0 commit comments

Comments
 (0)