Gentoo Archives: gentoo-commits

From: "Anthony G. Basile" <blueness@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/webapp-config:master commit in: doc/
Date: Thu, 28 Jun 2012 22:33:14
Message-Id: 1340922771.67d43e6ee0e6d411ceb937314985403497acc7ea.blueness@gentoo
1 commit: 67d43e6ee0e6d411ceb937314985403497acc7ea
2 Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
3 AuthorDate: Thu Jun 28 22:32:51 2012 +0000
4 Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
5 CommitDate: Thu Jun 28 22:32:51 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/webapp-config.git;a=commit;h=67d43e6e
7
8 doc/Makefile: fix parallel build, thanks Arfrever
9
10 ---
11 doc/Makefile | 13 ++++---------
12 1 files changed, 4 insertions(+), 9 deletions(-)
13
14 diff --git a/doc/Makefile b/doc/Makefile
15 index 4dc8e44..f38cdb2 100644
16 --- a/doc/Makefile
17 +++ b/doc/Makefile
18 @@ -17,8 +17,6 @@
19 MAN_PAGES = webapp-config.8 webapp-config.5 webapp-eclass.5
20 HTML_PAGES = webapp-config.8.html webapp-config.5.html webapp-eclass.5.html
21
22 -TMPFILE=./webapp-config.man
23 -
24 all: man html
25
26 html: $(HTML_PAGES)
27 @@ -31,13 +29,10 @@ clean:
28
29 %.html: %.xml
30 @echo HTML $@
31 - @xmlto html-nochunks $<
32 + @xmlto html-nochunks $< 2>/dev/null
33
34 %: %.xml
35 @echo MAN $@
36 - @xmlto man $<
37 -#
38 -# fix up the blank lines that docbook leaves behind
39 -#
40 - @cat $@ | sed -e 's/$$/.fred/g;' | tr -d '\n' | sed -e 's/.fred.fred\./.fred./g;' | sed -e 's/.fred/\n/g;' > $(TMPFILE)
41 - @mv $(TMPFILE) $@
42 + @xmlto man $< 2>/dev/null
43 + @cat $@ | sed -e 's/$$/.fred/g;' | tr -d '\n' | sed -e 's/.fred.fred\./.fred./g;' | sed -e 's/.fred/\n/g;' > $@.temp
44 + @mv $@.temp $@