From fcd8e2011da5f87d20189ad69a989c166e05413f Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Mon, 22 May 2006 07:41:15 +0000 Subject: [PATCH] * 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. --- ChangeLog | 9 +++++++++ Makefile.maint | 6 +++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 1a5f3463..d310fbe3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2006-05-22 Paul Eggert + + * 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 * data/yacc.c (yyparse): Wrap the final return from yyparse inside YYID diff --git a/Makefile.maint b/Makefile.maint index 543ca521..9bae6be6 100644 --- 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 -- 2.45.2