Merge ../bleed-2.6

[linux-2.6-omap-h63xx.git] / Documentation / DocBook / Makefile

diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 83bcb0ae09172a2cdd1e7104f4d251f0db208cd7..fa3e29ad8a463855c48241fb49ebfd3fd8ba86bb 100644 (file)
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -8,7 +8,7 @@
 
 DOCBOOKS := wanbook.xml z8530book.xml mcabook.xml videobook.xml \
            kernel-hacking.xml kernel-locking.xml deviceiobook.xml \
-           procfs-guide.xml writing_usb_driver.xml scsidrivers.xml \
+           procfs-guide.xml writing_usb_driver.xml \
            sis900.xml kernel-api.xml journal-api.xml lsm.xml usb.xml \
            gadget.xml libata.xml mtdnand.xml librs.xml
 
@@ -49,7 +49,7 @@ installmandocs: mandocs
 KERNELDOC = scripts/kernel-doc
 DOCPROC   = scripts/basic/docproc
 
-XMLTOFLAGS = -m Documentation/DocBook/stylesheet.xsl
+XMLTOFLAGS = -m $(srctree)/Documentation/DocBook/stylesheet.xsl
 #XMLTOFLAGS += --skip-validation
 
 ###
@@ -101,7 +101,7 @@ quiet_cmd_db2ps = XMLTO    $@
       cmd_db2ps = xmlto ps $(XMLTOFLAGS) -o $(dir $@) $<
 %.ps : %.xml
        @(which xmlto > /dev/null 2>&1) || \
-        (echo "*** You need to install DocBook stylesheets ***"; \
+        (echo "*** You need to install xmlto ***"; \
          exit 1)
        $(call cmd,db2ps)
 
@@ -109,7 +109,7 @@ quiet_cmd_db2pdf = XMLTO   $@
       cmd_db2pdf = xmlto pdf $(XMLTOFLAGS) -o $(dir $@) $<
 %.pdf : %.xml
        @(which xmlto > /dev/null 2>&1) || \
-        (echo "*** You need to install DocBook stylesheets ***"; \
+        (echo "*** You need to install xmlto ***"; \
          exit 1)
        $(call cmd,db2pdf)
 
@@ -120,7 +120,7 @@ quiet_cmd_db2html = XMLTO  $@
 
 %.html:        %.xml
        @(which xmlto > /dev/null 2>&1) || \
-        (echo "*** You need to install DocBook stylesheets ***"; \
+        (echo "*** You need to install xmlto ***"; \
          exit 1)
        @rm -rf $@ $(patsubst %.html,%,$@)
        $(call cmd,db2html)
@@ -131,7 +131,7 @@ quiet_cmd_db2man = XMLTO   $@
       cmd_db2man = if grep -q refentry $<; then xmlto man $(XMLTOFLAGS) -o $(obj)/man $< ; gzip -f $(obj)/man/*.9; fi
 %.9 : %.xml
        @(which xmlto > /dev/null 2>&1) || \
-        (echo "*** You need to install DocBook stylesheets ***"; \
+        (echo "*** You need to install xmlto ***"; \
          exit 1)
        $(call cmd,db2man)
        @touch $@