aboutsummaryrefslogtreecommitdiffstats
path: root/Documentation/DocBook/Makefile
diff options
context:
space:
mode:
authorBen Hutchings <ben@decadent.org.uk>2013-11-06 16:18:30 -0500
committerJiri Kosina <jkosina@suse.cz>2013-12-02 08:46:37 -0500
commit832919bfcf0cfd75767c68b0c61f7cf48be860a8 (patch)
tree7f55e492d622b3fffb24503ebed38c285c04dfcb /Documentation/DocBook/Makefile
parentc4d79a4799719f2b0cd354ee498aad605730c97e (diff)
DocBook: Make mandocs parallel-safe
Two concurrent calls to cmd_db2man may attempt to compress manual pages generated by each other. gzip can then fail due to an input file having already been compressed and removed. Move the gzip command to the top-level mandocs target. Signed-off-by: Ben Hutchings <ben@decadent.org.uk> Cc: Bastian Blank <waldi@debian.org> Acked-by: Rob Landley <rob@landley.net> Signed-off-by: Jiri Kosina <jkosina@suse.cz>
Diffstat (limited to 'Documentation/DocBook/Makefile')
-rw-r--r--Documentation/DocBook/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 5cf621b78c5e..0f9c6ff41aac 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -54,6 +54,7 @@ htmldocs: $(HTML)
54 54
55MAN := $(patsubst %.xml, %.9, $(BOOKS)) 55MAN := $(patsubst %.xml, %.9, $(BOOKS))
56mandocs: $(MAN) 56mandocs: $(MAN)
57 $(if $(wildcard $(obj)/man/*.9),gzip -f $(obj)/man/*.9)
57 58
58installmandocs: mandocs 59installmandocs: mandocs
59 mkdir -p /usr/local/man/man9/ 60 mkdir -p /usr/local/man/man9/
@@ -159,7 +160,7 @@ quiet_cmd_db2html = HTML $@
159 cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi 160 cp $(PNG-$(basename $(notdir $@))) $(patsubst %.html,%,$@); fi
160 161
161quiet_cmd_db2man = MAN $@ 162quiet_cmd_db2man = MAN $@
162 cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; gzip -f $(obj)/man/*.9; fi 163 cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; fi
163%.9 : %.xml 164%.9 : %.xml
164 @(which xmlto > /dev/null 2>&1) || \ 165 @(which xmlto > /dev/null 2>&1) || \
165 (echo "*** You need to install xmlto ***"; \ 166 (echo "*** You need to install xmlto ***"; \