summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Ravnborg <sam@ravnborg.org>2002-11-03 00:38:01 -0800
committerLinus Torvalds <torvalds@home.transmeta.com>2002-11-03 00:38:01 -0800
commit72882439aab1fbf7002d2876cd40db0ebd5e3080 (patch)
tree2a3da6bf9275941a18aa012664e1018235ba57fe
parent956ee799b03792551e55f38546a93838a4074584 (diff)
[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.
-rw-r--r--Documentation/DocBook/Makefile6
-rw-r--r--Makefile2
2 files changed, 3 insertions, 5 deletions
diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index dd49e638acd7..11c194d9615d 100644
--- 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 18c2f506ba5c..7d2ff24bb6c7 100644
--- 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
# ---------------------------------------------------------------------------