* Makefile.maint (gzip_rsyncable, GZIP_ENV): Compute within the

shell, not within 'make', so that 'make' by an ordinary builder
(using GNU make) does not worry about configuring gzip.  This also
works around a bug reported independently by Keith Thompson and by
Georg Schwarz, whereby gzip 1.2.4 --help would output usage on
stderr rather than stdout, messing up the build logs.

diff --git a/ChangeLog b/ChangeLog
index 1a5f3463af06e7daa530bd58eae6dccf485e1161..d310fbe35715f81701e29abdad0bd64cd05ec332 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2006-05-22  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * Makefile.maint (gzip_rsyncable, GZIP_ENV): Compute within the
+       shell, not within 'make', so that 'make' by an ordinary builder
+       (using GNU make) does not worry about configuring gzip.  This also
+       works around a bug reported independently by Keith Thompson and by
+       Georg Schwarz, whereby gzip 1.2.4 --help would output usage on
+       stderr rather than stdout, messing up the build logs.
+
 2006-05-21  Joel E. Denny  <jdenny@ces.clemson.edu>
 
        * data/yacc.c (yyparse): Wrap the final return from yyparse inside YYID

diff --git a/Makefile.maint b/Makefile.maint
index 543ca52160e880a265e0cc843fda7bb24a74f9c5..9bae6be66521ffaa7fb766e7730130fb8c78a265 100644 (file)
--- a/Makefile.maint
+++ b/Makefile.maint
@@ -25,9 +25,9 @@ ME := Makefile.maint
 
 # Do not save the original name or timestamp in the .tar.gz file.
 # Use --rsyncable if available.
-gzip_rsyncable := \
-  $(shell gzip --help|grep rsyncable >/dev/null && echo --rsyncable)
-GZIP_ENV = '--no-name --best $(gzip_rsyncable)'
+gzip_rsyncable = \
+  (gzip --help|grep rsyncable) >/dev/null 2>&1 && echo --rsyncable
+GZIP_ENV = "--no-name --best `$(gzip_rsyncable)`"
 
 CVS = cvs