[PATCH perf] make 'make html' work

[PATCH perf] make 'make html' work

[Kyle McMartin]

From: Kyle McMartin <kyle@redhat.com>

pushd tools/perf/Documentation
make html
popd

is failing for me... 

    ASCIIDOC perf-annotate.html                                                 
ERROR: unsafe: include file: /etc/asciidoc/./stylesheets/xhtml11.css
ERROR: unsafe: include file:
/etc/asciidoc/./stylesheets/xhtml11-manpage.css
ERROR: unsafe: include file:
/etc/asciidoc/./stylesheets/xhtml11-quirks.css
make: *** [perf-annotate.html] Error 1

Apparently asciidoc "unsafe" is the default mode of operation
in practice.

https://bugzilla.redhat.com/show_bug.cgi?id=506953

Works tidily now.

Signed-off-by: Kyle McMartin <kyle@redhat.com>

---
diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile
index 5457192..bdd3b7e 100644
--- a/tools/perf/Documentation/Makefile
+++ b/tools/perf/Documentation/Makefile
@@ -35,7 +35,7 @@ man7dir=$(mandir)/man7
 # DESTDIR=
 
 ASCIIDOC=asciidoc
-ASCIIDOC_EXTRA =
+ASCIIDOC_EXTRA = --unsafe
 MANPAGE_XSL = manpage-normal.xsl
 XMLTO_EXTRA =
 INSTALL?=install

Re: [PATCH perf] make 'make html' work

[Ingo Molnar]

* Kyle McMartin <kyle@mcmartin.ca> wrote:

> From: Kyle McMartin <kyle@redhat.com>
> 
> pushd tools/perf/Documentation
> make html
> popd
> 
> is failing for me... 
> 
>     ASCIIDOC perf-annotate.html                                                 
> ERROR: unsafe: include file: /etc/asciidoc/./stylesheets/xhtml11.css
> ERROR: unsafe: include file:
> /etc/asciidoc/./stylesheets/xhtml11-manpage.css
> ERROR: unsafe: include file:
> /etc/asciidoc/./stylesheets/xhtml11-quirks.css
> make: *** [perf-annotate.html] Error 1
> 
> Apparently asciidoc "unsafe" is the default mode of operation
> in practice.
>
> https://bugzilla.redhat.com/show_bug.cgi?id=506953
> 
> Works tidily now.

Applied to tip:perfcounters/urgent, thanks a lot Kyle!

	Ingo

[tip:perfcounters/urgent] perf tools: Make 'make html' work

[tip-bot for Kyle McMartin]

Commit-ID:  b395cd8a74b4a8d943dd4b5585e676f62f7350b3
Gitweb:     http://git.kernel.org/tip/b395cd8a74b4a8d943dd4b5585e676f62f7350b3
Author:     Kyle McMartin <kyle@redhat.com>
AuthorDate: Tue, 18 Aug 2009 12:41:25 -0400
Committer:  Ingo Molnar <mingo@elte.hu>
CommitDate: Tue, 18 Aug 2009 18:43:13 +0200

perf tools: Make 'make html' work

pushd tools/perf/Documentation
make html
popd

is failing for me...

    ASCIIDOC perf-annotate.html
ERROR: unsafe: include file: /etc/asciidoc/./stylesheets/xhtml11.css
ERROR: unsafe: include file:
/etc/asciidoc/./stylesheets/xhtml11-manpage.css
ERROR: unsafe: include file:
/etc/asciidoc/./stylesheets/xhtml11-quirks.css
make: *** [perf-annotate.html] Error 1

Apparently asciidoc "unsafe" is the default mode of operation
in practice.

https://bugzilla.redhat.com/show_bug.cgi?id=506953

Works tidily now.

Signed-off-by: Kyle McMartin <kyle@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <20090818164125.GM25206@bombadil.infradead.org>
Signed-off-by: Ingo Molnar <mingo@elte.hu>


---
 tools/perf/Documentation/Makefile |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile
index 5457192..bdd3b7e 100644
--- a/tools/perf/Documentation/Makefile
+++ b/tools/perf/Documentation/Makefile
@@ -35,7 +35,7 @@ man7dir=$(mandir)/man7
 # DESTDIR=
 
 ASCIIDOC=asciidoc
-ASCIIDOC_EXTRA =
+ASCIIDOC_EXTRA = --unsafe
 MANPAGE_XSL = manpage-normal.xsl
 XMLTO_EXTRA =
 INSTALL?=install