[PATCH 1/1] btrfs-progs: fix build, manpage compression command

[PATCH 1/1] btrfs-progs: fix build, manpage compression command

[Christian Hesse]

man pages for btrfs-progs are compressed by gzip by default. In Makefile
the variable GZIP is use, this evaluates to 'gzip gzip' on my system.
>From man gzip:

> The environment variable GZIP can hold a set of default options for
> gzip. These options are interpreted first and can be overwritten by
> explicit command line parameters.

So using any other variable name fixes this.

Signed-off-by: Christian Hesse <mail@eworm.de>
---
 Documentation/Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Documentation/Makefile b/Documentation/Makefile
index 45299bb..e79dd8f 100644
--- a/Documentation/Makefile
+++ b/Documentation/Makefile
@@ -45,7 +45,7 @@ MANPAGE_XSL = manpage-normal.xsl
 XMLTO = xmlto
 XMLTO_EXTRA =
 XMLTO_EXTRA = -m manpage-bold-literal.xsl
-GZIP = gzip
+GZIPCMD = gzip
 INSTALL ?= install
 RM ?= rm -f
 LNS ?= ln -sf
@@ -56,7 +56,7 @@ ifneq ($(findstring $(MAKEFLAGS),s),s)
 ifndef V
 	QUIET_ASCIIDOC	= @echo '   ' ASCIIDOC $@;
 	QUIET_XMLTO	= @echo '   ' XMLTO $@;
-	QUIET_GZIP	= @echo '   ' GZIP $@;
+	QUIET_GZIP	= @echo '   ' GZIPCMD $@;
 	QUIET_STDERR	= 2> /dev/null
 	QUIET_SUBDIR0	= +@subdir=
 	QUIET_SUBDIR1	= ;$(NO_SUBDIR) echo '   ' SUBDIR $$subdir; \
@@ -80,9 +80,9 @@ clean:
 	$(RM) *.xml *.xml+ *.8 *.8.gz
 
 %.8.gz : %.8
-	$(QUIET_GZIP)$(GZIP) -n -c $< > $@
+	$(QUIET_GZIP)$(GZIPCMD) -n -c $< > $@
 
-%.8 : %.xml 
+%.8 : %.xml
 	$(QUIET_XMLTO)$(RM) $@ && \
 	$(XMLTO) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
 %.xml : %.txt asciidoc.conf
-- 
2.0.0

Re: [PATCH 1/1] btrfs-progs: fix build, manpage compression command

[David Sterba]

On Tue, Jun 03, 2014 at 08:09:25AM +0200, Christian Hesse wrote:
> man pages for btrfs-progs are compressed by gzip by default. In Makefile
> the variable GZIP is use, this evaluates to 'gzip gzip' on my system.
> >From man gzip:
> 
> > The environment variable GZIP can hold a set of default options for
> > gzip. These options are interpreted first and can be overwritten by
> > explicit command line parameters.
> 
> So using any other variable name fixes this.

Thanks, I can see that you've fixed this bug for the second time.  The
GZIP variable name got reverted during the asciidoc update and slipped
through, sorry for that.

> --- a/Documentation/Makefile
> +++ b/Documentation/Makefile
> @@ -56,7 +56,7 @@ ifneq ($(findstring $(MAKEFLAGS),s),s)
>  ifndef V
>  	QUIET_ASCIIDOC	= @echo '   ' ASCIIDOC $@;
>  	QUIET_XMLTO	= @echo '   ' XMLTO $@;
> -	QUIET_GZIP	= @echo '   ' GZIP $@;
> +	QUIET_GZIP	= @echo '   ' GZIPCMD $@;

JFYI, I've removed this change so the output stays the same.

I've assembled a branch containing doc-only fixes, including this one,
and asked Chris do do a 3.14.3 release.

Re: [PATCH 1/1] btrfs-progs: fix build, manpage compression command

[Christian Hesse]

[-- Attachment #1: Type: text/plain, Size: 1504 bytes --]

David Sterba <dsterba@suse.cz> on Tue, 2014/06/03 11:14:
> On Tue, Jun 03, 2014 at 08:09:25AM +0200, Christian Hesse wrote:
> > man pages for btrfs-progs are compressed by gzip by default. In Makefile
> > the variable GZIP is use, this evaluates to 'gzip gzip' on my system.
> > >From man gzip:
> > 
> > > The environment variable GZIP can hold a set of default options for
> > > gzip. These options are interpreted first and can be overwritten by
> > > explicit command line parameters.
> > 
> > So using any other variable name fixes this.
> 
> Thanks, I can see that you've fixed this bug for the second time.  The
> GZIP variable name got reverted during the asciidoc update and slipped
> through, sorry for that.

No problem, it is not a big deal.

> > --- a/Documentation/Makefile
> > +++ b/Documentation/Makefile
> > @@ -56,7 +56,7 @@ ifneq ($(findstring $(MAKEFLAGS),s),s)
> >  ifndef V
> >  	QUIET_ASCIIDOC	= @echo '   ' ASCIIDOC $@;
> >  	QUIET_XMLTO	= @echo '   ' XMLTO $@;
> > -	QUIET_GZIP	= @echo '   ' GZIP $@;
> > +	QUIET_GZIP	= @echo '   ' GZIPCMD $@;
> 
> JFYI, I've removed this change so the output stays the same.
> 
> I've assembled a branch containing doc-only fixes, including this one,
> and asked Chris do do a 3.14.3 release.

Thanks.
Though I would be fine if this just goes into the next regular release.
-- 
Schoene Gruesse
Chris
                         O< ascii ribbon campaign
                   stop html mail - www.asciiribbon.org

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 836 bytes --]