I've cherry-picked these patches from master into branch-1-10. For now, I've changed all ChangeLog entry dates to be today (since that's what the GCS suggest IIRC), but I guess not doing so helps generate fewer conflicts in the ChangeLog file.
Cheers, Ralf commit 706122247ca86b392eff6351afda76bd4fefb97f Author: Ralf Wildenhues <[EMAIL PROTECTED]> Date: Sat Nov 10 10:20:08 2007 +0100 Fix default includes ordering to be `-I. -I$(srcdir) ...' again. * automake.in (handle_compile): Put -I$(srcdir) before include paths for config headers, as was done before Automake 1.10, but keep uniquified list without multiple adjacent spaces. * doc/automake.texi (Program variables): List include paths in order. * NEWS: Mention 1.10 regression. * tests/stdinc.test: New test. * tests/Makefile.am: Adjust. * THANKS: Update. Report by Kent Boortz. commit 351a81871ab638e6cd238b228bccd9074a06958e Author: NightStrike <[EMAIL PROTECTED]> Date: Thu Nov 8 22:23:34 2007 +0100 For PR automake/526: * doc/automake.texi (Basic Installation): Fix typo. commit 70847420d762a5eddec81f79c0f7a8c15928637a Author: Ralf Wildenhues <[EMAIL PROTECTED]> Date: Mon Oct 29 20:45:48 2007 +0100 Accommodate for new macro AC_AUTOCONF_VERSION. * aclocal.in (write_aclocal): Use AC_AUTOCONF_VERSION rather than m4_PACKAGE_VERSION. Define the former if not defined. * m4/amversion.in (AM_SET_CURRENT_AUTOMAKE_VERSION): Likewise. * tests/missing4.test: Use AC_AUTOCONF_VERSION. commit c13365444659b638ea7b77e8b9e4b90b63d706d7 Author: Bruno Haible <[EMAIL PROTECTED]> Date: Mon Oct 29 20:40:38 2007 +0100 * doc/automake.texi (Program variables): Clarify that Automake does not put DEFAULT_INCLUDES in AM_CPPFLAGS, but passes it directly to compilation commands. commit 325152e2e7ea6409b4598b7093df621ca307ca32 Author: Ralf Wildenhues <[EMAIL PROTECTED]> Date: Mon Oct 29 20:21:33 2007 +0100 Move to git as primary source repository. * Makefile.am (git-dist, git-release): Renamed and adjusted from ... (cvs-dist, cvs-release): ... these. (git-diff): New target, taken and adjusted from cvs-diff. * Makefile.in: Regenerate. * bootstrap: Adjust. * NEWS: Announce change. * doc/automake.texi (General Operation): cvs-dist is git-dist now. (Timeline): Mention change.