* automake.texi (Dist): Documented GZIP_ENV.

	* automake.in (handle_dist): Define and use GZIP_ENV, not GZIP.
	(initialize_global_constants): Use GZIP_ENV, not GZIP.

diff --git a/ChangeLog b/ChangeLog
index 2e71e9e882ec2c05ecccf99e6f85e9f18e597d39..77471e6152db84d8ae85144d6de315cd0393885a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+1998-12-01  Tom Tromey  <tromey@cygnus.com>
+
+       * automake.texi (Dist): Documented GZIP_ENV.
+       * automake.in (handle_dist): Define and use GZIP_ENV, not GZIP.
+       (initialize_global_constants): Use GZIP_ENV, not GZIP.
+
 1998-11-27  Tom Tromey  <tromey@cygnus.com>
 
        * automake.in (quote_cond_val): Use "\002", not '\002', to

diff --git a/automake.in b/automake.in
index 51c95d62e3761a787ba229fceae84ce67ef3ee6d..edbecd6b99c0e3412811948a7985aad8b12c88e9 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -2478,7 +2478,7 @@ sub handle_dist
     # Some boilerplate.
     $output_vars .= &file_contents ('dist-vars') . "\n";
     &define_variable ('TAR', $TAR);
-    &define_variable ('GZIP', '--best');
+    &define_variable ('GZIP_ENV', '--best');
 
     # Put these things in rules section so it is easier for whoever
     # reads Makefile.in.
@@ -2513,7 +2513,7 @@ sub handle_dist
 # tarfile.
 distcheck: dist
        -rm -rf $(distdir)
-       GZIP=$(GZIP) $(TAR) zxf $(distdir).tar.gz
+       GZIP=$(GZIP_ENV) $(TAR) zxf $(distdir).tar.gz
        mkdir $(distdir)/=build
        mkdir $(distdir)/=inst
        dc_install_base=`cd $(distdir)/=inst && pwd`; \\'
@@ -6128,7 +6128,7 @@ sub initialize_global_constants
                     . 'shar $(distdir) | gzip > $(distdir).shar.gz'
                     . "\n");
     $dist{'dist-zip'} = "\t" . 'zip -rq $(distdir).zip $(distdir)' . "\n";
-    $dist{'dist'} = "\t" .  'GZIP=$(GZIP) $(TAR) chozf $(distdir).tar.gz $(distdir)' . "\n";
+    $dist{'dist'} = "\t" .  'GZIP=$(GZIP_ENV) $(TAR) chozf $(distdir).tar.gz $(distdir)' . "\n";
     $dist_trailer = "\t" . '-rm -rf $(distdir)' . "\n";
 }
 

diff --git a/automake.texi b/automake.texi
index e03d2411c8644dccbb9dfd8530afa42ba625f8e4..546f4607e0e894361d08a5a2fe9296e3d74a2c2e 100644 (file)
--- a/automake.texi
+++ b/automake.texi
@@ -2838,6 +2838,8 @@ precisely it is named @samp{@var{package}-@var{version}.tar.gz}.
 @cvindex PACKAGE
 @cvindex VERSION
 @trindex dist
+You can use the @code{make} variable @samp{GZIP_ENV} to control how gzip
+is run.  The default setting is @samp{--best}.
 
 For the most part, the files to distribute are automatically found by
 Automake: all source files are automatically included in a distribution,