| Message ID | 20200416162058.201954-2-irogers@google.com |
|---|---|
| State | Not Applicable |
| Delegated to: | BPF Maintainers |
| Headers | show |
| Series | perf tools: add support for libpfm4 | expand |
Em Thu, Apr 16, 2020 at 09:20:55AM -0700, Ian Rogers escreveu: > This will allow parent makefiles to pass values to asciidoc. Thanks, applied > Signed-off-by: Ian Rogers <irogers@google.com> > --- > tools/perf/Documentation/Makefile | 4 ++-- > 1 file changed, 2 insertions(+), 2 deletions(-) > > diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile > index 31824d5269cc..6e54979c2124 100644 > --- a/tools/perf/Documentation/Makefile > +++ b/tools/perf/Documentation/Makefile > @@ -48,7 +48,7 @@ man5dir=$(mandir)/man5 > man7dir=$(mandir)/man7 > > ASCIIDOC=asciidoc > -ASCIIDOC_EXTRA = --unsafe -f asciidoc.conf > +ASCIIDOC_EXTRA += --unsafe -f asciidoc.conf > ASCIIDOC_HTML = xhtml11 > MANPAGE_XSL = manpage-normal.xsl > XMLTO_EXTRA = > @@ -59,7 +59,7 @@ HTML_REF = origin/html > > ifdef USE_ASCIIDOCTOR > ASCIIDOC = asciidoctor > -ASCIIDOC_EXTRA = -a compat-mode > +ASCIIDOC_EXTRA += -a compat-mode > ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions > ASCIIDOC_EXTRA += -a mansource="perf" -a manmanual="perf Manual" > ASCIIDOC_HTML = xhtml5 > -- > 2.26.1.301.g55bc3eb7cb9-goog >
diff --git a/tools/perf/Documentation/Makefile b/tools/perf/Documentation/Makefile index 31824d5269cc..6e54979c2124 100644 --- a/tools/perf/Documentation/Makefile +++ b/tools/perf/Documentation/Makefile @@ -48,7 +48,7 @@ man5dir=$(mandir)/man5 man7dir=$(mandir)/man7 ASCIIDOC=asciidoc -ASCIIDOC_EXTRA = --unsafe -f asciidoc.conf +ASCIIDOC_EXTRA += --unsafe -f asciidoc.conf ASCIIDOC_HTML = xhtml11 MANPAGE_XSL = manpage-normal.xsl XMLTO_EXTRA = @@ -59,7 +59,7 @@ HTML_REF = origin/html ifdef USE_ASCIIDOCTOR ASCIIDOC = asciidoctor -ASCIIDOC_EXTRA = -a compat-mode +ASCIIDOC_EXTRA += -a compat-mode ASCIIDOC_EXTRA += -I. -rasciidoctor-extensions ASCIIDOC_EXTRA += -a mansource="perf" -a manmanual="perf Manual" ASCIIDOC_HTML = xhtml5
This will allow parent makefiles to pass values to asciidoc. Signed-off-by: Ian Rogers <irogers@google.com> --- tools/perf/Documentation/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)