From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Wed, 21 Dec 2011 19:35:35 +0000 (+0100)
Subject: Merge branch 'maint' into branch-1.11
X-Git-Tag: v1.11.2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=db622310d06f83e21c00d217fdf4b94e62477067;p=platform%2Fupstream%2Fautomake.git

Merge branch 'maint' into branch-1.11

* maint:
  tests: fix spurious failure on systems lacking unistd.h
  test defs: hack to support autoconf-wrapper programs
  tests: fix a minor spurious failure with FreeBSD make
  tests: make two test scripts executable
  readme: reference webpages for automake mailing lists
  readme: update advice about testsuite execution
  readme: don't reference the old homepage at sources.redhat.com
  hacking: some more fixlets
  * NEWS: Fix typo in 'make dist-bzip2' description.
---

db622310d06f83e21c00d217fdf4b94e62477067
diff --cc NEWS
index 290578e,46803a7..0017dbd
--- a/NEWS
+++ b/NEWS
@@@ -34,11 -30,8 +34,11 @@@ New in 1.11.1c
    - You may adjust the compression options used in dist-xz and dist-bzip2.
      The default is now merely -e for xz, but still -9 for bzip;  you may
      specify a different level via the XZ_OPT and BZIP2 envvars respectively.
-     E.g., "make dist-xz XZ_OPT=-7" or "make dist-xz BZIP2=-5"
+     E.g., "make dist-xz XZ_OPT=-7" or "make dist-bzip2 BZIP2=-5"
  
 +  - The `compile' script now converts some options for MSVC for a better
 +    user experience.  Similarly, the new `ar-lib' script wraps Microsoft lib.
 +
    - The py-compile script now accepts empty arguments passed to the options
      `--destdir' and `--basedir', and complains about unrecognized options.
      Moreover, a non-option argument or a special `--' argument terminates