00-dist-is-dist-all.patch

[Akim Demaille]

This has been discussed some time ago.

Index: ChangeLog
from  Akim Demaille  <address@hidden>

        * lib/am/distdir.am (dist): Rename as...
        (dist-gzip): this.
        (dist): Additional name for dist-all.
        * automake.texi (Options, Dist): Adjust.

Index: NEWS
--- NEWS Sun, 23 Sep 2001 08:36:36 +0200 akim
+++ NEWS Sun, 23 Sep 2001 09:10:19 +0200 akim
@@ -1,5 +1,7 @@
 New in 1.5a:
 * Autoconf 2.52 is required.
+* `dist' generates all the archive flavors, as did `dist-all'.
+* `dist-gzip' generates the Gzip tar file only.
 
 New in 1.5:
 * Support for `configure.ac'.
Index: automake.texi
--- automake.texi Sun, 23 Sep 2001 08:36:36 +0200 akim
+++ automake.texi Sun, 23 Sep 2001 09:10:19 +0200 akim
@@ -3590,7 +3590,7 @@ @node Clean, Dist, Install, Top
 removed by which target, we've adopted a heuristic which we believe was
 first formulated by Fran@,{c}ois Pinard:

address@hidden @bullet
address@hidden @bullet
 @item
 If @code{make} built it, and it is commonly something that one would
 want to rebuild (for instance, a @file{.o} file), then
@@ -3620,9 +3620,10 @@ @node Dist, Tests, Clean, Top
 @cindex make distcheck

 The @code{dist} target in the generated @file{Makefile.in} can be used
-to generate a gzip'd @code{tar} file for distribution.  The tar file is
-named based on the @samp{PACKAGE} and @samp{VERSION} variables; more
-precisely it is named @address@hidden@var{version}.tar.gz}.
+to generate a gzip'd @code{tar} file and other flavors of archive for
+distribution.  The files is named based on the @samp{PACKAGE} and
address@hidden variables; more precisely the gzip'd @code{tar} file is
+named @address@hidden@var{version}.tar.gz}.
 @cvindex PACKAGE
 @cvindex VERSION
 @trindex dist
@@ -3726,13 +3727,11 @@ dist-hook:

 @section The types of distributions

-By default Automake generates a @samp{.tar.gz} file when asked to create
-a distribution.  However, some projects prefer different packaging
-formats.  Automake accomodates most of these using options;
address@hidden
address@hidden dist-gzip
+Automake generates a @samp{.tar.gz} file when asked to create a
+distribution and other archives formats, @ref{Options}.  The target
address@hidden generates the @samp{.tar.gz} file only.

-Automake also generates a @code{dist-all} target which can be used to
-make all the requested packaged distributions at once.


 @node Tests, Options, Dist, Top
@@ -3861,30 +3860,30 @@ @node Options, Miscellaneous, Tests, Top

 @item @code{dist-bzip2}
 @cindex Option, dist-bzip2
-Generate a @code{dist-bzip2} target as well as the ordinary @code{dist}
-target.  This new target will create a bzip2 tar archive of the
-distribution.  bzip2 archives are frequently smaller than even gzipped
-archives.
+Generate a @code{dist-bzip2} target, creating a bzip2 tar archive of the
+distribution.  @code{dist} will create it in addition to the other
+formats.  bzip2 archives are frequently smaller than gzipped archives.
 @trindex dist-bzip2

 @item @code{dist-shar}
 @cindex Option, dist-shar
-Generate a @code{dist-shar} target as well as the ordinary @code{dist}
-target.  This new target will create a shar archive of the
-distribution.
+Generate a @code{dist-shar} target, creating a shar archive of the
+distribution.  @code{dist} will create it in addition to the other
+formats.
 @trindex dist-shar

 @item @code{dist-zip}
 @cindex Option, dist-zip
-Generate a @code{dist-zip} target as well as the ordinary @code{dist}
-target.  This new target will create a zip archive of the distribution.
+Generate a @code{dist-zip} target, creating a zip archive of the
+distribution.  @code{dist} will create it in addition to the other
+formats.
 @trindex dist-zip

 @item @code{dist-tarZ}
 @cindex Option, dist-tarZ
-Generate a @code{dist-tarZ} target as well as the ordinary @code{dist}
-target.  This new target will create a compressed tar archive of the
-distribution.
+Generate a @code{dist-tarZ} target, creating a compressed tar archive of
+the distribution.  @code{dist} will create it in addition to the other
+formats.
 @trindex dist-tarZ

 @item @code{no-dependencies}
Index: stamp-vti
--- stamp-vti Sun, 23 Sep 2001 08:36:36 +0200 akim
+++ stamp-vti Sun, 23 Sep 2001 09:10:19 +0200 akim
@@ -1,4 +1,4 @@
address@hidden UPDATED 3 September 2001
address@hidden UPDATED 23 September 2001
 @set UPDATED-MONTH September 2001
 @set EDITION 1.5a
 @set VERSION 1.5a
Index: version.texi
--- version.texi Sun, 23 Sep 2001 08:36:36 +0200 akim
+++ version.texi Sun, 23 Sep 2001 09:10:19 +0200 akim
@@ -1,4 +1,4 @@
address@hidden UPDATED 3 September 2001
address@hidden UPDATED 23 September 2001
 @set UPDATED-MONTH September 2001
 @set EDITION 1.5a
 @set VERSION 1.5a
Index: lib/am/distdir.am
--- lib/am/distdir.am Tue, 07 Aug 2001 20:20:45 +0200 akim
+++ lib/am/distdir.am Sun, 23 Sep 2001 09:10:19 +0200 akim
@@ -165,8 +165,8 @@ distdir: $(DISTFILES)
 if %?TOPDIR_P%

 GZIP_ENV = --best
-.PHONY: dist
-dist: distdir
+.PHONY: dist-gzip
+dist-gzip: distdir
        $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
        -chmod -R a+w $(distdir) >/dev/null 2>&1; rm -rf $(distdir)

@@ -215,8 +215,8 @@ dist-zip: distdir

 if %?TOPDIR_P%

-.PHONY: dist-all
-dist-all: distdir
+.PHONY: dist dist-all
+dist dist-all: distdir
        $(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 ?BZIP2?        $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
 ?COMPRESS?     $(AMTAR) chof - $(distdir) | compress -c >$(distdir).tar.Z