revert mistaken commit

* lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
versions.

* lib/config.guess, lib/config.sub, lib/texinfo.tex: New upstream
versions.

* lib/install-sh: Use IFS=/ to split directories on /, don't translate
/ into % as it prevents directory names using %...

* doc/automake.texi (Public macros): Typo.
* aclocal.in: Typo in comment.

* lib/depcomp: Handle "#line" markers as well as "# " markers in
"cpp" style, so it can work with newer HP compilers (for their
ia64 systems).

* doc/automake.texi (Public macros) <AM_WITH_DMALLOC>: Reword to
fix an underful hbox.
* lib/INSTALL, lib/config.guess, lib/config.sub, lib/texinfo.tex:
New upstream version.

* m4/python.m4 (_AM_PYTHON_INTERPRETER_LIST): Add python2.5.

* automake.in (make_paragraphs): Do not define %TOPDIR%, now that
lib/am/header-vars.am no longer uses it.
* lib/am/libtool.am (distclean-am, distclean-libtool): Define
if TOPDIR_P is true, not TOPDIR.
Suggested by Stepan Kasal.

* automake.in (read_am_file): Correctly diagnose comments following
trailing backslash.
* tests/commen10.test: New file.
* tests/Makefile.am (TESTS): Add commen10.test.
Report from Harald Dunkel.

typo

* automake.in (scan_autoconf_traces): Scan AC_SUBST_TRACE instead
of AC_SUBST.
* lib/am/header-vars.am (srcdir, top_srcdir, top_builddir, INSTALL):
Do not define, they are AC_SUBST_TRACEd by Autoconf.
* m4/init.m4 (AM_INIT_AUTOMAKE): Require Autoconf 2.59c.
* tests/include.test: Call AC_OUTPUT.

* lib/mkinstalldirs: Fix support for directory name with spaces if
`mkdir -p' does not work.
* tests/Makefile.am (TESTS): Add mkinst3.test.
* tests/mkinst3.test: New file.
Report from Noah Friedman.

* doc/automake.texi (Include, Extending aclocal): Typos.
Report from Karl Berry.

* lib/mdate-sh: Avoid infinite loop with GNU ls when TIME_STYLE is set.
* tests/txinfo28.test: Set TIME_STYLE.
Report from Vincent Lefevre and James Youngman.

* lib/Automake/Variable.pm (define, _new): Remember the helper
variable created for the last conditional += on each variable, and
only append further += in the same condition to this last helper
variable, not to older helper variables.  This way the order of
the items appended to the variable is preserved.
* tests/cond21.test: Adjust.
* tests/cond38.test: New file.
* tests/Makefile.am (TESTS): Add cond38.test.
Report from Ed Hartnett.

* tests/aclocal5.test: Adjust to recent CVS Autoconf changes.

* automake.in (handle_footer): Do not output an unformatted
definition of SOURCES, it is already done correctly in
generate_makefile.  This superfluous definition introduced long
lines in some Makefiles, hence breakages in tools with a limited
line length.  Report from Mathias Froehlich.

* lib/am/texibuild.am (?GENERIC_INFO?%SOURCE_SUFFIX%%DEST_SUFFIX%):
Fix redirections in previous patch.

* lib/am/texibuild.am (?GENERIC_INFO?%SOURCE_SUFFIX%%DEST_SUFFIX%):
Do not backup any file if makeinfo is not installed.
* lib/missing (makeinfo): Do not touch a missing info file.
* tests/txinfo30.test: New file.
* tests/Makefile.am (TESTS): Add txinfo30.test.
Report from Bob Proulx.

* doc/automake.texi (Extending aclocal): Typo.

* lib/am/texinfos.am (.dvi.ps): Add $(am__TEXINFO_TEX_DIR) to TEXINPUTS.

typo

typo

Fix PR automake/461:
* automake.in (require_build_directory): Canonize directories with
different name, such as `foo/bar' and `./foo//bar'.
* tests/subobj9.test: Augment to test that.
Report from Tom Tromey.

* COPYING, ChangeLog, ChangeLog.00, ChangeLog.01, ChangeLog.02,
ChangeLog.03, ChangeLog.96, ChangeLog.98, HACKING, Makefile.am,
NEWS, README, TODO, aclocal.in, automake.in, bootstrap, configure,
configure.ac, doc/Makefile.am, doc/fdl.texi, lib/COPYING,
lib/Makefile.am, lib/acinstall, lib/compile, lib/config-ml.in,
lib/config.guess, lib/config.sub, lib/depcomp, lib/elisp-comp,
lib/gnupload, lib/mdate-sh, lib/missing, lib/py-compile,
lib/symlink-tree, lib/texinfo.tex, lib/ylwrap,
lib/Automake/ChannelDefs.pm, lib/Automake/Channels.pm,
lib/Automake/Condition.pm, lib/Automake/Config.in,
lib/Automake/Configure_ac.pm, lib/Automake/DisjConditions.pm,
lib/Automake/FileUtils.pm, lib/Automake/General.pm,
lib/Automake/Item.pm, lib/Automake/ItemDef.pm,
lib/Automake/Location.pm, lib/Automake/Makefile.am,
lib/Automake/Options.pm, lib/Automake/Rule.pm,
lib/Automake/RuleDef.pm, lib/Automake/Struct.pm,
lib/Automake/VarDef.pm, lib/Automake/Variable.pm,
lib/Automake/Version.pm, lib/Automake/Wrap.pm,
lib/Automake/XFile.pm, lib/Automake/tests/Condition.pl,
lib/Automake/tests/DisjConditions.pl,
lib/Automake/tests/Makefile.am, lib/Automake/tests/Version.pl,
lib/Automake/tests/Wrap.pl, lib/am/Makefile.am,
lib/am/ansi2knr.am, lib/am/check.am, lib/am/clean-hdr.am,
lib/am/clean.am, lib/am/compile.am, lib/am/configure.am,
lib/am/data.am, lib/am/dejagnu.am, lib/am/depend.am,
lib/am/depend2.am, lib/am/distdir.am, lib/am/footer.am,
lib/am/header-vars.am, lib/am/header.am, lib/am/inst-vars.am,
lib/am/install.am, lib/am/java.am, lib/am/lang-compile.am,
lib/am/lex.am, lib/am/library.am, lib/am/libs.am,
lib/am/libtool.am, lib/am/lisp.am, lib/am/ltlib.am,
lib/am/ltlibrary.am, lib/am/mans-vars.am, lib/am/mans.am,
lib/am/multilib.am, lib/am/program.am, lib/am/progs.am,
lib/am/python.am, lib/am/remake-hdr.am, lib/am/scripts.am,
lib/am/subdirs.am, lib/am/tags.am, lib/am/texi-vers.am,
lib/am/texibuild.am, lib/am/texinfos.am, lib/am/yacc.am,
m4/Makefile.am, tests/aclibobj.test, tests/acloca10.test,
tests/acloca11.test, tests/acloca12.test, tests/acloca13.test,
tests/acloca14.test, tests/acloca15.test, tests/acloca16.test,
tests/acloca17.test, tests/acloca18.test, tests/acloca19.test,
tests/aclocal.test, tests/aclocal3.test, tests/aclocal4.test,
tests/aclocal5.test, tests/aclocal6.test, tests/aclocal7.test,
tests/aclocal8.test, tests/aclocal9.test, tests/acoutbs.test,
tests/acoutbs2.test, tests/acoutnoq.test, tests/acoutpt.test,
tests/acoutpt2.test, tests/acoutqnl.test, tests/acsilent.test,
tests/acsubst.test, tests/acsubst2.test, tests/all.test,
tests/alloca.test, tests/alloca2.test, tests/alpha.test,
tests/alpha2.test, tests/amassign.test, tests/ammissing.test,
tests/ansi.test, tests/ansi10.test, tests/ansi2.test,
tests/ansi3.test, tests/ansi3b.test, tests/ansi4.test,
tests/ansi5.test, tests/ansi6.test, tests/ansi7.test,
tests/ansi8.test, tests/ansi9.test, tests/ar.test, tests/ar2.test,
tests/asm.test, tests/autohdr.test, tests/autohdr2.test,
tests/autohdr3.test, tests/autohdr4.test, tests/automake.test,
tests/auxdir.test, tests/auxdir2.test, tests/auxdir3.test,
tests/auxdir4.test, tests/backsl.test, tests/backsl2.test,
tests/backsl3.test, tests/backsl4.test, tests/badline.test,
tests/badopt.test, tests/badprog.test, tests/block.test,
tests/bsource.test, tests/canon.test, tests/canon2.test,
tests/canon3.test, tests/canon4.test, tests/canon5.test,
tests/ccnoco.test, tests/check.test, tests/check2.test,
tests/check3.test, tests/check4.test, tests/checkall.test,
tests/clean.test, tests/clean2.test, tests/colneq.test,
tests/colneq2.test, tests/colon.test, tests/colon2.test,
tests/colon3.test, tests/colon4.test, tests/colon5.test,
tests/colon6.test, tests/colon7.test, tests/comment.test,
tests/comment2.test, tests/comment3.test, tests/comment4.test,
tests/comment5.test, tests/comment6.test, tests/comment7.test,
tests/comment8.test, tests/comment9.test, tests/compile.test,
tests/compile_f90_c_cxx.test, tests/compile_f_c_cxx.test,
tests/cond.test, tests/cond10.test, tests/cond11.test,
tests/cond13.test, tests/cond14.test, tests/cond15.test,
tests/cond16.test, tests/cond17.test, tests/cond18.test,
tests/cond19.test, tests/cond2.test, tests/cond20.test,
tests/cond21.test, tests/cond22.test, tests/cond23.test,
tests/cond24.test, tests/cond25.test, tests/cond26.test,
tests/cond27.test, tests/cond28.test, tests/cond29.test,
tests/cond3.test, tests/cond30.test, tests/cond31.test,
tests/cond32.test, tests/cond33.test, tests/cond34.test,
tests/cond35.test, tests/cond36.test, tests/cond37.test,
tests/cond4.test, tests/cond5.test, tests/cond6.test,
tests/cond7.test, tests/cond8.test, tests/cond9.test,
tests/condd.test, tests/condhook.test, tests/condinc.test,
tests/condinc2.test, tests/condlib.test, tests/condman.test,
tests/condman2.test, tests/conf2.test, tests/confdeps.test,
tests/conff.test, tests/conff2.test, tests/confh.test,
tests/confh4.test, tests/confh5.test, tests/config.test,
tests/confincl.test, tests/conflnk.test, tests/conflnk2.test,
tests/conflnk3.test, tests/confsub.test, tests/confvar.test,
tests/confvar2.test, tests/copy.test, tests/ctarget1.test,
tests/cxx.test, tests/cxx2.test, tests/cxxansi.test,
tests/cxxcpp.test, tests/cxxlibobj.test, tests/cxxlink.test,
tests/cxxnoc.test, tests/cxxo.test, tests/cygwin32.test,
tests/dash.test, tests/defs.in, tests/defun.test,
tests/defun2.test, tests/dejagnu.test, tests/dejagnu2.test,
tests/dejagnu3.test, tests/dejagnu4.test, tests/dejagnu5.test,
tests/dejagnu6.test, tests/dejagnu7.test, tests/depacl2.test,
tests/depcomp.test, tests/depcomp2.test, tests/depcomp3.test,
tests/depcomp4.test, tests/depcomp5.test, tests/depdist.test,
tests/depend.test, tests/depend2.test, tests/depend3.test,
tests/depend4.test, tests/destdir.test, tests/dirforbid.test,
tests/dirlist.test, tests/discover.test, tests/distcom2.test,
tests/distcom3.test, tests/distcom4.test, tests/distcom5.test,
tests/distcom6.test, tests/distcom7.test, tests/distdir.test,
tests/distname.test, tests/dollar.test, tests/double.test,
tests/dup2.test, tests/else.test, tests/empty.test,
tests/empty2.test, tests/empty3.test, tests/empty4.test,
tests/exdir.test, tests/exdir2.test, tests/exeext.test,
tests/exeext2.test, tests/exeext3.test, tests/exeext4.test,
tests/exsource.test, tests/ext.test, tests/ext2.test,
tests/extra.test, tests/extra2.test, tests/extra3.test,
tests/extra4.test, tests/extra5.test, tests/extra6.test,
tests/extra7.test, tests/f90only.test, tests/flibs.test,
tests/fn99.test, tests/fnoc.test, tests/fo.test, tests/fonly.test,
tests/fortdep.test, tests/fpinst2.test, tests/fpinstall.test,
tests/gcj.test, tests/gcj2.test, tests/gcj3.test, tests/gcj4.test,
tests/gcj5.test, tests/getopt.test, tests/gettext.test,
tests/gettext2.test, tests/gnits.test, tests/gnits2.test,
tests/gnits3.test, tests/gnumake.test, tests/gnuwarn.test,
tests/gnuwarn2.test, tests/header.test, tests/help.test,
tests/hfs.test, tests/hosts.test, tests/implicit.test,
tests/include.test, tests/include2.test, tests/info.test,
tests/insh2.test, tests/install2.test, tests/installdir.test,
tests/instdat.test, tests/instdat2.test, tests/instexec.test,
tests/insthook.test, tests/instman.test, tests/instman2.test,
tests/instsh.test, tests/instsh2.test, tests/instspc.test,
tests/interp.test, tests/interp2.test, tests/java.test,
tests/java2.test, tests/java3.test, tests/javaprim.test,
tests/javasubst.test, tests/ldadd.test, tests/ldflags.test,
tests/lex.test, tests/lex2.test, tests/lex3.test, tests/lex4.test,
tests/lex5.test, tests/libobj10.test, tests/libobj11.test,
tests/libobj12.test, tests/libobj13.test, tests/libobj14.test,
tests/libobj2.test, tests/libobj3.test, tests/libobj4.test,
tests/libobj5.test, tests/libobj7.test, tests/libobj8.test,
tests/library.test, tests/library2.test, tests/library3.test,
tests/libtool.test, tests/libtool2.test, tests/libtool3.test,
tests/libtool4.test, tests/libtool5.test, tests/libtool6.test,
tests/libtool7.test, tests/libtool8.test, tests/libtool9.test,
tests/license.test, tests/link_c_cxx.test, tests/link_dist.test,
tests/link_f90_only.test, tests/link_f_only.test,
tests/link_fc.test, tests/link_fccxx.test, tests/link_fcxx.test,
tests/lisp2.test, tests/lisp3.test, tests/lisp4.test,
tests/lisp5.test, tests/lisp6.test, tests/lisp7.test,
tests/lisp8.test, tests/listval.test, tests/location.test,
tests/longlin2.test, tests/longline.test, tests/ltcond.test,
tests/ltcond2.test, tests/ltconv.test, tests/ltdeps.test,
tests/ltlibobjs.test, tests/ltlibsrc.test, tests/maintclean.test,
tests/make.test, tests/makej.test, tests/makevars.test,
tests/man.test, tests/man2.test, tests/mclean.test,
tests/mdate.test, tests/mdate2.test, tests/mdate3.test,
tests/mdate4.test, tests/missing.test, tests/missing2.test,
tests/missing3.test, tests/mkinst2.test, tests/mkinstall.test,
tests/mmodely.test, tests/multlib.test, tests/nobase.test,
tests/nodef.test, tests/nodef2.test, tests/nodep.test,
tests/nodepcomp.test, tests/nodist.test, tests/nodist2.test,
tests/nodist3.test, tests/nogzip.test, tests/nogzip2.test,
tests/noinst.test, tests/noinstdir.test, tests/nolink.test,
tests/nostdinc.test, tests/number.test, tests/obsolete.test,
tests/order.test, tests/outdir.test, tests/output.test,
tests/output10.test, tests/output11.test, tests/output12.test,
tests/output2.test, tests/output3.test, tests/output4.test,
tests/output5.test, tests/output6.test, tests/output7.test,
tests/output8.test, tests/output9.test, tests/overrid.test,
tests/parse.test, tests/percent.test, tests/percent2.test,
tests/phony.test, tests/pluseq.test, tests/pluseq10.test,
tests/pluseq2.test, tests/pluseq3.test, tests/pluseq4.test,
tests/pluseq5.test, tests/pluseq6.test, tests/pluseq7.test,
tests/pluseq8.test, tests/pluseq9.test, tests/postproc.test,
tests/ppf77.test, tests/pr2.test, tests/pr204.test,
tests/pr211.test, tests/pr220.test, tests/pr224.test,
tests/pr229.test, tests/pr243.test, tests/pr266.test,
tests/pr279-2.test, tests/pr279.test, tests/pr287.test,
tests/pr300-lib.test, tests/pr300-ltlib.test,
tests/pr300-prog.test, tests/pr307.test, tests/pr401.test,
tests/pr401b.test, tests/pr401c.test, tests/pr72.test,
tests/pr87.test, tests/pr9.test, tests/prefix.test,
tests/primary.test, tests/primary2.test, tests/primary3.test,
tests/proginst.test, tests/python.test, tests/python10.test,
tests/python11.test, tests/python12.test, tests/python2.test,
tests/python3.test, tests/python4.test, tests/python5.test,
tests/python6.test, tests/python7.test, tests/python8.test,
tests/python9.test, tests/recurs.test, tests/recurs2.test,
tests/regex.test, tests/remake.test, tests/remake2.test,
tests/remake3.test, tests/remake4.test, tests/remake5.test,
tests/req.test, tests/reqd.test, tests/reqd2.test,
tests/rulepat.test, tests/scripts.test, tests/seenc.test,
tests/sinclude.test, tests/space.test, tests/specflg.test,
tests/specflg2.test, tests/specflg3.test, tests/specflg6.test,
tests/specflg7.test, tests/specflg8.test, tests/specflg9.test,
tests/spell.test, tests/spell2.test, tests/spell3.test,
tests/spelling.test, tests/spy.test, tests/srcsub.test,
tests/srcsub2.test, tests/stamph2.test, tests/stdlib.test,
tests/stdlib2.test, tests/strip.test, tests/subcond.test,
tests/subcond2.test, tests/subcond3.test, tests/subdir.test,
tests/subdir2.test, tests/subdir3.test, tests/subdir4.test,
tests/subdir5.test, tests/subdir6.test, tests/subdir7.test,
tests/subdir8.test, tests/subdir9.test,
tests/subdirbuiltsources.test, tests/subobj.test,
tests/subobj2.test, tests/subobj3.test, tests/subobj4.test,
tests/subobj5.test, tests/subobj6.test, tests/subobj7.test,
tests/subobj8.test, tests/subobj9.test, tests/subobjname.test,
tests/subpkg.test, tests/subpkg2.test, tests/subst.test,
tests/subst2.test, tests/substre2.test, tests/substref.test,
tests/substtarg.test, tests/suffix.test, tests/suffix10.test,
tests/suffix11.test, tests/suffix2.test, tests/suffix3.test,
tests/suffix4.test, tests/suffix5.test, tests/suffix6.test,
tests/suffix7.test, tests/suffix8.test, tests/suffix9.test,
tests/symlink.test, tests/symlink2.test, tests/symlink3.test,
tests/syntax.test, tests/tags.test, tests/tagsub.test,
tests/tar.test, tests/tar2.test, tests/tar3.test,
tests/target-cflags.test, tests/targetclash.test,
tests/transform.test, tests/txinfo.test, tests/txinfo10.test,
tests/txinfo13.test, tests/txinfo16.test, tests/txinfo17.test,
tests/txinfo18.test, tests/txinfo19.test, tests/txinfo2.test,
tests/txinfo20.test, tests/txinfo21.test, tests/txinfo22.test,
tests/txinfo23.test, tests/txinfo24.test, tests/txinfo25.test,
tests/txinfo26.test, tests/txinfo27.test, tests/txinfo28.test,
tests/txinfo29.test, tests/txinfo3.test, tests/txinfo4.test,
tests/txinfo5.test, tests/txinfo6.test, tests/txinfo7.test,
tests/txinfo8.test, tests/txinfo9.test, tests/unused.test,
tests/vars.test, tests/vars3.test, tests/vartar.test,
tests/version.test, tests/version2.test, tests/version3.test,
tests/version4.test, tests/version6.test, tests/version7.test,
tests/version8.test, tests/vpath.test, tests/vtexi.test,
tests/vtexi2.test, tests/warnopts.test, tests/werror.test,
tests/werror2.test, tests/whoami.test, tests/xsource.test,
tests/yacc.test, tests/yacc2.test, tests/yacc3.test,
tests/yacc4.test, tests/yacc5.test, tests/yacc6.test,
tests/yacc7.test, tests/yacc8.test, tests/yaccpp.test,
tests/yaccvpath.test: Update FSF postal mail address.

* tests/cxxnoc.test: Adjust grep pattern for CC, because CVS
Autoconf currently defines a CCC variable.

* tests/output11.test, tests/output12.test: Use rm -f.

Alexandre Duret-Lutz  <adl@gnu.org>

Support for remote LIBOBJS (and friends) with subdir-objects.
Fixes PR automake/401.

* automake.in (config_libobj_dir): New variable.
(scan_autoconf_traces): Set config_libobj_dir from AC_CONFIG_LIBOBJ_DIR.
(handle_LIBOBJS_or_ALLOCA, require_libsource_with_macro): New functions.
(handle_LIBOBJS, handle_ALLOCA): Use them.  Adjust location of
dependency files, possibly in a subdirectory.
* tests/pr401.test, tests/pr401b.test, tests/pr401c.test: New tests.
* tests/Makefile.am (TESTS): Add them.
* doc/automake.texi (Optional) <AC_CONFIG_LIBOBJ_DIR>: Document.
(LIBOBJS): Document changes in behaviour of
LIBOBJS, ALLOCA, LTLIBOBJS & LTALLOCA in the presence of
subdir-objects and an invocation of AC_CONFIG_LIBOBJ_DIR.

* doc/automake.texi (Dist): Correct English.

s/Speaking about potential distribution errors,...
 /Speaking of potential distribution errors,.../

* doc/automake.texi: When the phrase "for instance" introduces a
sentence, it should be delimited by a comma.

* doc/automake.texi: Fix a few typos.

* doc/automake.texi (Uniform): Use xmldir instead of htmldir as
example, since the GCS now define htmldir.
(Auxiliary Programs): Mention config-ml.in and symlink-tree.
Give a URL for texinfo.tex.
(Public macros): Sort alphabetically, and move obsolete macros...
(Obsolete macros): ... here.
Prompted by Karl Berry.

* doc/automake.texi (Multiple Outputs): Fix mistakes reported by
Jim Meyering.

* doc/automake.texi (Multiple Outputs): Fix mistakes reported by
Jim Meyering.

* doc/automake.texi (Multiple Outputs): Fix mistakes reported by
Jim Meyering.

* lib/am/lisp.am ($(am__ELCFILES)): Prevent races if the recover
rule is run with `make -j'.
* doc/automake.texi (Multiple Outputs): Adjust.
* tests/lisp6.test: Augment it.
* tests/lisp8.test: New file.
* tests/Makefile.am (TESTS): Add lisp8.test.
Suggested by Bruno Haible.

* doc/automake.texi: Use @:, @., @!, and @tie{} where appropriate.

* lib/am/lisp.am ($(am__ELCFILES)): Do not attempt to recover
a missing *.elc file if it cannot be created because emacs does
not exist.
* tests/lisp7.test: New file.
* tests/Makefile.am (TESTS): Add lisp7.test.
Report from Greg Schafer.

* doc/automake.texi: Replace wicked whiches by thats.

* aclocal.in (scan_configure_dep, scan_file): Include file names
are relative to the directory of configure.ac, not to the
directory of the file doing the include.  Remove code for this
latter case.
* tests/acloca13.test: Run distcheck and make sure all macros are
actually distributed.

For PR automake/450:
* aclocal.in (scan_file, scan_configure_dep): Skip missing sincluded
files.
* automake.in (scan_autoconf_traces): Likewise.
* tests/sinclude.test: Augment.
Report from Peter Breitenlohner.

For PR automake/450:
* aclocal.in (write_aclocal, trace_used_macros): Do not add/remove
acinclude.m4 and configure.ac to the include map in these two
places ...
(strip_redundant_includes): ... do it here.  This completes the
previous change from 2005-03-01, that did not update
write_aclocal.
* tests/acloca19.test: Augment.
Report from Peter Breitenlohner.

* tests/comment9.test: Typo.

* automake.in (read_am_file): Preserve backslashes preceding ##-lines.
* tests/comment9.test: New file.
* tests/Makefile.am (TESTS): Add comment9.test.
Report from Julien Sopena.

Fix for PR automake/450:
* aclocal.in (trace_used_macros): Do not explicitly trace files
included by configure.ac.
* tests/acloca19.test: New file.
* tests/Makefile.am (TESTS): Add acloca19.test.
Report from Peter Breitenlohner.

Fix for PR automake/448:
* automake.in (handle_factored_dependencies): Flag install-hook as
an error.
* tests/insthook.test: Exercise this.

* m4/lispdir.m4: Use datarootdir instead of datadir to match GCS.
* doc/automake.texi (Hard-Coded Install Paths): Adjust.

* doc/automake.texi: Replace many uses of @samp by @code, and
vice versa.  Use @command, @option, and @env where appropriate.

* doc/automake.texi: "filename" -> "file name", for consistency
with GNU Coding Standards.  See also Paul's change on 2004-08-20
in Autoconf.

* doc/automake.texi (A Library, Libtool Libraries): Show how to link
a program with a static or libtool library.
(Program and Library Variables): Make clearer that _LDADD and
_LIBADD may also list libraries.
Prompted by a mail from Bruce Korb.

* doc/automake.texi (Alternative): Show how to rewrite nobase_
variables using custom directory variables, and link to node
Uniform.  Suggested by Leonardo Boiko.

* doc/automake.texi (Flag Variables Ordering, User Variables):
Make clearer who the maintainer is, and that he can AC_SUBST AM_
variables in configure.ac.  Suggested by Norman Gray.
(Uniform, Public macros, Libtool Issues, Java Support,
Conditionals): Use `---' for em dash, and stick them to the
enclosing text.

* doc/automake.texi: Reword a few sentences to fix all underflow
and overflow warnings during `make dvi'.
(Auxiliary Programs) <configure.guess, config.sub>: Update URL.
(Public macros) <AM_WITH_DMALLOC>: Likewise.

* lib/INSTALL, lib/config-ml.in, lib/config.guess, lib/config.sub,
lib/texinfo.tex: New upstream versions.

* doc/automake.texi (Hard-Coded Install Paths): New node.
(Extending, Extending aclocal, Python): Link to it.
(Extending): Don't show how to install a file in /etc/ directly,
this is insane.

* automake.in (read_am_file): Define variable containing long
lines as VAR_PRETTY to work around tools with limited input width.
* tests/longlin2.test: New file.
* tests/Makefile.am (TESTS): Add it.
Report from Albert Chin.

Fix for PR automake/447:
* lib/depcomp (tru64) [libtool]: Also check for $dir.libs/$base.o.d.
Report from Mathias Doreille.  Add some old comments from
Nicolas Joly for reference.

* lib/mdate-sh: Check the size of the word following the month to
catch Darwin.  This way the filename can contain spaces.

* doc/automake.texi (Requirements, Options): Typos.

* lib/missing (makeinfo): Compute the output file if neither -o
nor @setfilename is used.
Reported by Miroslaw Dobrzanski-Neumann and Bruno Haible.

* doc/automake.texi (Requirements): Show one example of
AC_CONFIG_FILES with multiple outputs, and correct a few typos.

* aclocal.in ($serial_line_rx): Expect at least one space between
`serial' and the following number.
Report from Jim Meyering.

* lib/mdate-sh: Cope with Darwin's Day/Month/Year output.
Report from Peter O'Gorman.

* aclocal.in (usage, parse_arguments): New --dry-run and --diff
options.
(install_file, write_aclocal): Honor --dry-run and --diff.
* doc/automake.texi (aclocal options): Document --dry-run and --diff.
(Serials): Mention --diff.
* lib/Automake/FileUtils.pm (handle_exec_errors): Accept an
$expected_exit_code argument.
(xsystem): Take a list of arguments, not a string.
* tests/acloca18.test: Use --dry-run and --diff.
Suggested by Paul Eggert.

* doc/automake.texi (aclocal options, Macro search path,
Extending aclocal, Local Macros, Serials, Future of aclocal): Make
these subsection of ...
(Invoking aclocal): ... this.

* aclocal.in ($serial_line_rx): Allow trailing garbage after the
serial number.
(scan_file): Explicitly mark the "ill-formed serial" message
as a warning.
* doc/automake.texi (aclocal options, Local Macros): Link to...
(Serials): ... this new section.

* lib/compile: Likewise.

* lib/elisp-comp: Use `(exit N); exit N', not `(exit N); exit';
see 2004-12-17.
* lib/mdate-sh, lib/py-compile, lib/ylwrap: Exit with nonzero
status if a write failure occurs with --help or --version option,
as below.

* lib/depcomp: Exit with nonzero status if a write failure occurs
with --help or --version option.
* lib/elisp-comp: Likewise.
* lib/gnupload: Likewise.
* lib/install-sh: Likewise.
* lib/missing: Likewise.
* lib/mkinstalldirs: Likewise.

* doc/automake.texi (aclocal options): Typo.

* aclocal.in (list_compare): New functions.
(scan_file): Honor #serial lines.
* tests/acloca18.test: New test.
* tests/Makefile.am (TESTS): Add it.
* doc/automake.texi (aclocal options, Local Macros): Document
#serial.

Preliminary support for `aclocal --install'.
This still lacks #serial support.
* aclocal.in (reset_maps, install_file): New functions.
(write_aclocal): Copy files if --install.
(usage, parse_arguments): Recognize --install.
("MAIN"): Start aclocal again if some file were installed.
* tests/acloca10.test: Augment to test --install.
* tests/aclocal.in, tests/defs.in: Add support for
ACLOCAL_TESTSUITE_FLAGS, used by acloca10.test.
* doc/automake.texi (aclocal options, Local Macros): Document
--install.
(Future of aclocal): Adjust.

* doc/automake.texi (Macro search path): Using --acdir is not
obvious, it's erroneous.

* doc/automake.texi (direntry): Let `info Automake' point to the
manual, and `info automake' to the `Invoking automake' node.  Like
in Autoconf.

* lib/Automake/Configure_ac.pm: s/filename/file_name/g.
From Paul Eggert.

* lib/Automake/FileUtils.pm: Rename filename as file_name to be
consistent with the terminology of the GNU coding standards.
From Paul Eggert.
(update_file): Accept a $force argument, so that --force always
updates the time stamps.

* doc/automake.texi (How the Linker is Chosen): Explain how the
linker is chosen without diagram, and update to match the code.
Suggestion from Adrian Bunk.

* lib/am/subdirs.am ($(RECURSIVE_TARGETS), $(RECURSIVE_CLEAN_TARGETS)):
Process all words of $MAKEFLAGS when checking for -k.
* tests/check4.test: New file.
* tests/Makefile.am (TESTS): Add check4.test.
Report from Eric Blake.

* m4/amversion.in (AM_AUTOMAKE_VERSION): Point users to
AM_INIT_AUTOMAKE if the version passed is incorrect.
* tests/version8.test: New file.
* tests/Makefile.am (TESTS): Add version8.test.

* m4/amversion.in, m4/as.m4, m4/auxdir.m4, m4/ccstdc.m4,
m4/cond.m4, m4/depend.m4, m4/depout.m4, m4/dmalloc.m4, m4/gcj.m4,
m4/header.m4, m4/init.m4, m4/install-sh.m4, m4/lead-dot.m4,
m4/lex.m4, m4/lispdir.m4, m4/maintainer.m4, m4/make.m4,
m4/minuso.m4, m4/missing.m4, m4/mkdirp.m4, m4/multi.m4,
m4/obsol-gt.m4, m4/obsol-lt.m4, m4/obsolete.m4, m4/options.m4,
m4/protos.m4, m4/python.m4, m4/regex.m4, m4/runlog.m4,
m4/sanity.m4, m4/strip.m4, m4/tar.m4: Use the same all-permissive
license that is used in aclocal.m4.  Relicensing backed by RMS.

* doc/automake.texi (A Library, LIBOBJS): Mention that empty
libraries are not portable.

Typo.

* aclocal.in ($ac_defun_rx): Match AU_ALIAS.
* tests/aclocal5.test (MORE_DEFS): Rename as...
(AM_TEST_SUBST): this so that undefined macros are caught.
And make it an alias of AC_SUBST.
Test AU_ALIAS.
Reported by Martin Bravenboer.

Fix handling of per-target flags in link rules.
* automake.in (define_per_target_linker_variable): New function.
(handle_programs, handle_ltlibraries): Use it.
(%link_languages): New map.
(register_language): Fill it.
* lib/am/ltlibrary.am (%LTLIBRARY%): Do not append
$(%XLTLIBRARY%_LDFLAGS) to the command, this is now done by
define_per_target_linker_variable if needed.
* lib/am/program.am (%PROGRAM%%EXEEXT%): Likewise with
$(%XPROGRAM%_LDFLAGS).
* doc/automake.texi (Program and Library Variables): Mention
AM_LDFLAGS and AM_LIBTOOLFLAGS in the definition of maude_LDFLAGS
and maude_LIBTOOLFLAGS.
* tests/libtool9.test: New file.
* tests/Makefile.am (TESTS): Add it.
* NEWS: Explain the backward incompatibility.
Report from Akim Demaille.

* doc/automake.texi (Requirements) <AC_CONFIG_FILES>: Discuss
specifications with shell variables.
(Optional) <AC_CONFIG_HEADERS, AC_CONFIG_LINKS>: Point to
AC_CONFIG_FILES for this explanation.
* automake.in (substitute_ac_subst_variables_worker,
substitute_ac_subst_variables): Mew functions.
(rewrite_inputs_into_dependencies): Use substitute_ac_subst_variables
to ignore dependencies that contain unAC_SUBSTed shell variables.
(handle_configure): Likewise, do not output rules for
AC_CONFIG_HEADERS, AC_CONFIG_FILES, and AC_CONFIG_LINKS targets that
unAC_SUBSTed contain shell variables.
* tests/autohdr4.test: Use an AC_SUBST variable in a specification.
* tests/output11.test, tests/output12.test: New files.
* tests/Makefile.am (TESTS): Add output11.test and output12.test.

* aclocal.in (parse_arguments, write_aclocal): Bump copyright year.
* automake.in ($gen_copyright, version): Likewise.

* tests/man2.test, tests/transform.test: Specify --mandir, in order
not to fail when Autoconf changes its $mandir default.

Support for `install-dvi', `install-html', `install-ps', and
`install-pdf', as recently introduced into the GNU Coding
Standard.

* automake.in (handle_factored_dependencies): Reject
uninstall-dvi-local, uninstall-html-local, uninstall-info-local,
uninstall-ps-local, and uninstall-pdf-local.  Allow
install-info-local even when no-installinfo is not used.
(handle_data): Allow datarootdir, dvidir, htmldir, pdfdir, and psdir.
(%standard_prefix): Declare these new standard directory variables.
* doc/automake.texi (Texinfo, Third-Party Makefiles): Document
install-dvi, install-html, install-pdf, and install-ps.
(Extending): Document install-local-dvi, install-local-html,
install-local-info, install-local-pdf, and install-local-ps.
* lib/Automake/Rule.pm (%dependencies): Add new install rules,
and remove uninstall-info.
* /cvs/automake/automake/lib/am/texinfos.am (install-dvi,
install-dvi-am, install-dvi-recursive, install-html,
install-html-am, install-html-recursive, install-pdf,
install-pdf-am, install-pdf-recursive, install-ps, install-ps-am,
install-ps-recursive, uninstall-dvi-am, uninstall-html-am,
uninstall-pdf-am, uninstall-ps-am): New rules.
(uninstall-info): Delete.
* tests/txinfo21.test: Augment to check for these new rules.
* tests/exdir2.test: Do not use `htmldir' as example of
undefined directory.
* tests/overrid.test: Do not be fooled by install-ps and
install-html.
* tests/txinfo10.test: Do not grep for uninstall-info-recursive.

* automake.in (Preprocessed Fortran): Fix the definition of FCLINK.

* Makefile.am (maintainer-check): Refine check for @_ in scalar
context.  Check for correct use of PRE_INSTALL, NORMAL_INSTALL,
POST_INSTALL, PRE_UNINSTALL, NORMAL_UNINSTALL, and POST_UNINSTALL.
* lib/am/texinfos.am (uninstall-info-am): Hide the invocation of
$(PRE_UNINSTALL).

* lib/am/texinfos.am (uninstall-info-am): Show change of
directory while uninstalling DJGPP-style info files.

Declare recursive install targets as dependencies of `.MAKE', so
that `make -n install' works with BSD Make too.

* lib/config-ml.in, lib/config.guess, lib/config.sub,
lib/texinfo.tex: New upstream versions.

* doc/automake.texi (gettext): Move the paragraph about
dist_list_LISP...
(Emacs Lisp): ... here.
Report from Bruno Haible.

* doc/automake.texi: Bump GFDL version to 1.2, since that is
what we distribute.

* doc/automake.texi: Fix more misuses of @xref and @pxref, including
some of the "correction" below.  Thanks to Karl Berry.

* doc/automake.texi: Correct several misuses of @xref and @pxref.

* install-sh: Use `(exit N); exit N', not `(exit N); exit'.
Otherwise, install-sh could exit with improper exit status when
exiting via a trapped interrupt.  Thanks to a report from Bob Proulx.