btrfs-progs: fix build, manpage compression command
Subsystems (2)
PATCH 1/1 btrfs-progs: fix build, manpage compression command
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.
Quoted 5 lines
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.
--- Documentation/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
Documentation/Makefile +4 -4
@@ -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
Signature · 1 line
2.0.0
Quoted 9 lines · Christian Hesse
man pages for btrfs-progs are compressed by gzip by default. In
Makefilethe variable GZIP is use, this evaluates to 'gzip gzip' on my system.Quoted 5 lines
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.
Documentation/Makefile ifneq ($(findstring $(MAKEFLAGS),s),s) · line 59
Quoted 8 lines
Documentation/Makefile +1
-1@@ -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.
David Sterba <[email protected]> on Tue, 2014/06/03 11:14:
Quoted 9 lines · Christian Hesse
Quoted 8 lines
man pages for btrfs-progs are compressed by gzip by default. In
Makefilethe variable GZIP is use, this evaluates to 'gzip gzip' on my system.Quoted 5 lines
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.
Quoted 5 lines
Quoted 1 line
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.
Quoted 11 lines
Documentation/Makefile ifneq ($(findstring $(MAKEFLAGS),s),s) · line 59
Quoted 8 lines
Documentation/Makefile +1
-1@@ -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.
Quoted 2 lines
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.
Signature · 4 lines
Schoene Gruesse
Chris
O< ascii ribbon campaign
stop html mail - www.asciiribbon.org