From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 14 Dec 2012 10:56:06 +0000 (+0100)
Subject: Merge branch 'master' into ng/master
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=88945834a2272e0a33fd4237b212b3d445acc13f;p=thirdparty%2Fautomake.git

Merge branch 'master' into ng/master

* master:
  fixup: source 'test-init.sh', not './defs', in a test
  docs: fixlet about xz compression levels and command line options
  maint: more files excluded in 'update-copyright'
  maint: adapt 'update-copyright' recipe to the new $(FETCHFILES) format
  HACKING: update instructions to update the manuals at www.gnu.org
  maint: add an explicative comment in Makefile
  maint: factor out the name of the dir where web manuals are generated
  maint: rename rules to build/upload web manuals
  cosmetic: minor variable and rules reordering in Makefile.am
  docs: build the web manuals for CVS in the builddir, not in the srcdir
  release: automate uploading of web manuals in CVS
  docs: AM_CFLAGS: remove reference to non-existing "more detailed" desc
  tests: avoid two spurious failures on FreeBSD
  tests: improve 'pkg-config' requirement

Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
---

88945834a2272e0a33fd4237b212b3d445acc13f
diff --cc doc/automake-ng.texi
index 8bdfec171,d2e3b3897..7fb6cada8
--- a/doc/automake-ng.texi
+++ b/doc/automake-ng.texi
@@@ -8603,19 -8681,23 +8603,19 @@@ By default, this rule makes @samp{xz} u
  @option{-e}.  To make it use a different one, set the @env{XZ_OPT}
  environment variable.  For example, run this command to use the
  default compression ratio, but with a progress indicator:
 -@samp{make dist-xz XZ_OPT=-ve}.
 -@trindex dist-xz
 +@smallexample
- make dist AM_DIST_FORMATS=xz XZ_OPT=-7e
++make dist AM_DIST_FORMATS=xz XZ_OPT=-ve
 +@end smallexample
 +@cindex xz compression
 +@cindex Compression, xz format
  
 -@item @code{dist-zip}
 +@item @code{zip}
  Generate a zip archive of the distribution.
 -@trindex dist-zip
 +@cindex zip compression
 +@cindex Compression, zip format
  
 -@item @code{dist-tarZ}
 -Generate a compressed tar archive of
 -the distribution.
 -@trindex dist-tarZ
  @end table
  
 -The rule @code{dist} (and its historical synonym @code{dist-all}) will
 -create archives in all the enabled formats, @ref{Options}.  By
 -default, only the @code{dist-gzip} target is hooked to @code{dist}.
 -
  
  @node Tests
  @chapter Support for test suites