From: Christian Hesse <mail@eworm.de>
To: linux-btrfs@vger.kernel.org
Cc: Qu Wenruo <quwenruo@cn.fujitsu.com>,
David Sterba <dsterba@suse.cz>, Christian Hesse <mail@eworm.de>
Subject: [PATCH 1/1] btrfs-progs: fix build, manpage compression command
Date: Tue, 3 Jun 2014 08:09:25 +0200 [thread overview]
Message-ID: <1401775765-16646-1-git-send-email-mail@eworm.de> (raw)
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
next reply other threads:[~2014-06-03 6:17 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-06-03 6:09 Christian Hesse [this message]
2014-06-03 9:14 ` [PATCH 1/1] btrfs-progs: fix build, manpage compression command David Sterba
2014-06-03 11:55 ` Christian Hesse
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1401775765-16646-1-git-send-email-mail@eworm.de \
--to=mail@eworm.de \
--cc=dsterba@suse.cz \
--cc=linux-btrfs@vger.kernel.org \
--cc=quwenruo@cn.fujitsu.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).