[PATCH] kbuild: docbook: use $(obj) and $(src) rather than specific path

[PATCH] kbuild: docbook: use $(obj) and $(src) rather than specific path

[Masahiro Yamada]

Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
---
 Documentation/DocBook/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index bc3d9f8..6ea50a3 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -16,7 +16,7 @@ DOCBOOKS := z8530book.xml device-drivers.xml \
 	    alsa-driver-api.xml writing-an-alsa-driver.xml \
 	    tracepoint.xml drm.xml media_api.xml
 
-include $(srctree)/Documentation/DocBook/media/Makefile
+include $(srctree)/$(src)/media/Makefile
 
 ###
 # The build process is as follows (targets):
@@ -57,14 +57,14 @@ mandocs: $(MAN)
 
 installmandocs: mandocs
 	mkdir -p /usr/local/man/man9/
-	install Documentation/DocBook/man/*.9.gz /usr/local/man/man9/
+	install $(obj)/man/*.9.gz /usr/local/man/man9/
 
 ###
 #External programs used
 KERNELDOC = $(srctree)/scripts/kernel-doc
 DOCPROC   = $(objtree)/scripts/docproc
 
-XMLTOFLAGS = -m $(srctree)/Documentation/DocBook/stylesheet.xsl
+XMLTOFLAGS = -m $(srctree)/$(src)/stylesheet.xsl
 XMLTOFLAGS += --skip-validation
 
 ###
@@ -138,7 +138,7 @@ quiet_cmd_db2pdf = PDF     $@
 
 
 index = index.html
-main_idx = Documentation/DocBook/$(index)
+main_idx = $(obj)/$(index)
 build_main_index = rm -rf $(main_idx); \
 		   echo '<h1>Linux Kernel HTML Documentation</h1>' >> $(main_idx) && \
 		   echo '<h2>Kernel Version: $(KERNELVERSION)</h2>' >> $(main_idx) && \
@@ -147,7 +147,7 @@ build_main_index = rm -rf $(main_idx); \
 quiet_cmd_db2html = HTML    $@
       cmd_db2html = xmlto xhtml $(XMLTOFLAGS) -o $(patsubst %.html,%,$@) $< && \
 		echo '<a HREF="$(patsubst %.html,%,$(notdir $@))/index.html"> \
-        $(patsubst %.html,%,$(notdir $@))</a><p>' > $@
+		$(patsubst %.html,%,$(notdir $@))</a><p>' > $@
 
 %.html:	%.xml
 	@(which xmlto > /dev/null 2>&1) || \
-- 
1.8.3.2

Re: [PATCH] kbuild: docbook: use $(obj) and $(src) rather than specific path

[Michal Marek]

On 2014-01-20 06:10, Masahiro Yamada wrote:
> Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com>
> ---
>  Documentation/DocBook/Makefile | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
> 
> diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
> index bc3d9f8..6ea50a3 100644
> --- a/Documentation/DocBook/Makefile
> +++ b/Documentation/DocBook/Makefile
> @@ -16,7 +16,7 @@ DOCBOOKS := z8530book.xml device-drivers.xml \
>  	    alsa-driver-api.xml writing-an-alsa-driver.xml \
>  	    tracepoint.xml drm.xml media_api.xml
>  
> -include $(srctree)/Documentation/DocBook/media/Makefile
> +include $(srctree)/$(src)/media/Makefile

You can drop the $(srctree) here, make will find the file in the VPATH.

Michal

Re: [PATCH] kbuild: docbook: use $(obj) and $(src) rather than specific path

[Masahiro Yamada]

Hi Michal,


> > -include $(srctree)/Documentation/DocBook/media/Makefile
> > +include $(srctree)/$(src)/media/Makefile
> 
> You can drop the $(srctree) here, make will find the file in the VPATH.
> 
> Michal

OK. I will post v2.

Best Regards
Masahiro yamada