summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Mack <daniel@zonque.org>2015-03-09 18:00:46 +0100
committerMaciej Wereski <m.wereski@partner.samsung.com>2015-06-09 11:31:22 +0200
commit5249bc5beb3028e0bfd614a0c603fb84a7f82489 (patch)
tree3c85700bbf72a409dcd10bd75fd4d1064f40ca53
parent3a524fafbf719774ad4e1716bd8706889809a6b5 (diff)
downloadlinux-3.10-5249bc5beb3028e0bfd614a0c603fb84a7f82489.tar.gz
linux-3.10-5249bc5beb3028e0bfd614a0c603fb84a7f82489.tar.bz2
linux-3.10-5249bc5beb3028e0bfd614a0c603fb84a7f82489.zip
Documentation: kdbus: fix location for generated files
The generated files should reside in Documentation/kdbus, not in the top-level of the source tree. Also add a .gitignore file and ignore everything that was built from the XML files. Signed-off-by: Daniel Mack <daniel@zonque.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--Documentation/kdbus/.gitignore2
-rw-r--r--Documentation/kdbus/Makefile4
2 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/kdbus/.gitignore b/Documentation/kdbus/.gitignore
new file mode 100644
index 00000000000..b4a77ccba9b
--- /dev/null
+++ b/Documentation/kdbus/.gitignore
@@ -0,0 +1,2 @@
+*.7
+*.html
diff --git a/Documentation/kdbus/Makefile b/Documentation/kdbus/Makefile
index cd6b48ee41b..f6d491251c2 100644
--- a/Documentation/kdbus/Makefile
+++ b/Documentation/kdbus/Makefile
@@ -18,10 +18,10 @@ HTMLFILES := $(patsubst %.xml, %.html, $(XMLFILES))
XMLTO_ARGS := -m $(obj)/stylesheet.xsl
%.7: %.xml
- xmlto man $(XMLTO_ARGS) -o . $<
+ xmlto man $(XMLTO_ARGS) -o $(obj) $<
%.html: %.xml
- xmlto html-nochunks $(XMLTO_ARGS) -o . $<
+ xmlto html-nochunks $(XMLTO_ARGS) -o $(obj) $<
mandocs: $(MANFILES)