[PATCH] docbook: *docs targets fixed, clean ok for html

Made the *docs targets work after the restructuring of the kbuild files.

Fix cleaning up after make htmldocs, there are some directories
that needs to be deleted in that case.

diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index dd49e638acd7b52cd3344c2b897908be12544d12..11c194d9615df9cad9ffe76ed0013506abdbfdf0 100644 (file)
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -160,8 +160,6 @@ clean-files := $(DOCBOOKS) \
        $(patsubst %.fig,%.png, $(IMG-parportbook)) \
        $(C-procfs-example)
 
-ifneq ($(wildcard $(BOOKS)),)
-clean-rule := rm -rf $(wildcard $(BOOKS))
+ifneq ($(wildcard $(patsubst %.html,%,$(HTML))),)
+clean-rule := rm -rf $(wildcard $(patsubst %.html,%,$(HTML)))
 endif
-
-include $(TOPDIR)/Rules.make

diff --git a/Makefile b/Makefile
index 18c2f506ba5c431663731cdb542b54532022a9af..7d2ff24bb6c719f40b0ce12a4a32f2245b916658 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -799,7 +799,7 @@ help:
 # Documentation targets
 # ---------------------------------------------------------------------------
 sgmldocs psdocs pdfdocs htmldocs: scripts
-       $(Q)$(MAKE) -f Documentation/DocBook/Makefile $@
+       $(Q)$(MAKE) -f scripts/Makefile.build obj=Documentation/DocBook $@
 
 # Scripts to check various things for consistency
 # ---------------------------------------------------------------------------