Re: [PATCH] perf tools: Fix output directory of Documentation/

[Robert Richter <rric@kernel.org>]

Jiri and Arnaldo,

On 20.06.13 12:26:03, Arnaldo Carvalho de Melo wrote:
> Robert, so this one is with:
> 
> 	cd tools/perf
> 	make install-doc
> 
> I tested with:
> 
> 	make -C tools/perf O=/tmp/build/perf install-doc
> 
> and it works, so it is just the in tree build that fails.

The patch below fixes this. Thanks for reporting.

-Robert


>From 69714303856005a1dc84c0594a4c3ec1013f8a80 Mon Sep 17 00:00:00 2001
From: Robert Richter <robert.richter@calxeda.com>
Date: Fri, 21 Jun 2013 14:26:44 +0200
Subject: [PATCH] perf tools: Fixing in-tree documentation build error

Fixing build error for:

 $ cd tools/perf
 $ make install-doc

The following patch changed handling of the OUTPUT variable:

 79e10cb perf tools: Fix output directory of Documentation/

Now, OUTPUT is unset if the build directory is the current working dir
which is the usual case for kbuild. The xmlto rule could not handle
this. This patch fixes this.

Reported-by: Jiri Olsa <jolsa@redhat.com>
Signed-off-by: Robert Richter <robert.richter@calxeda.com>
Signed-off-by: Robert Richter <rric@kernel.org>
---
 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 1368e88..5a37a7c 100644
--- a/tools/perf/Documentation/Makefile
+++ b/tools/perf/Documentation/Makefile
@@ -271,7 +271,7 @@ $(MAN_HTML): $(OUTPUT)%.html : %.txt
 
 $(OUTPUT)%.1 $(OUTPUT)%.5 $(OUTPUT)%.7 : $(OUTPUT)%.xml
 	$(QUIET_XMLTO)$(RM) $@ && \
-	$(XMLTO) -o $(OUTPUT) -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
+	$(XMLTO) -o $(OUTPUT). -m $(MANPAGE_XSL) $(XMLTO_EXTRA) man $<
 
 $(OUTPUT)%.xml : %.txt
 	$(QUIET_ASCIIDOC)$(RM) $@+ $@ && \
-- 
1.7.7.6