1 files changed, 13 insertions, 9 deletions

diff --git a/Documentation/DocBook/Makefile b/Documentation/DocBook/Makefile
index 164c1c76971f..85916f13d330 100644
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@ -8,12 +8,11 @@
 
 DOCBOOKS := z8530book.xml  \
             kernel-hacking.xml kernel-locking.xml \
-            writing_usb_driver.xml networking.xml \
-            kernel-api.xml filesystems.xml lsm.xml kgdb.xml \
-            gadget.xml libata.xml mtdnand.xml librs.xml rapidio.xml \
-            genericirq.xml s390-drivers.xml scsi.xml \
-            sh.xml w1.xml \
-            writing_musb_glue_layer.xml
+            networking.xml \
+            filesystems.xml lsm.xml kgdb.xml \
+            libata.xml mtdnand.xml librs.xml rapidio.xml \
+            s390-drivers.xml scsi.xml \
+            sh.xml w1.xml
 
 ifeq ($(DOCBOOKS),)
 
@@ -62,11 +61,14 @@ MAN := $(patsubst %.xml, %.9, $(BOOKS))
 mandocs: $(MAN)
         find $(obj)/man -name '*.9' | xargs gzip -nf
 
+# Default location for installed man pages
+export INSTALL_MAN_PATH = $(objtree)/usr
+
 installmandocs: mandocs
-        mkdir -p /usr/local/man/man9/
+        mkdir -p $(INSTALL_MAN_PATH)/man/man9/
         find $(obj)/man -name '*.9.gz' -printf '%h %f\n' | \
                 sort -k 2 -k 1 | uniq -f 1 | sed -e 's: :/:' | \
-                xargs install -m 644 -t /usr/local/man/man9/
+                xargs install -m 644 -t $(INSTALL_MAN_PATH)/man/man9/
 
 # no-op for the DocBook toolchain
 epubdocs:
@@ -238,7 +240,9 @@ dochelp:
         @echo  '  psdocs          - Postscript'
         @echo  '  xmldocs         - XML DocBook'
         @echo  '  mandocs         - man pages'
-        @echo  '  installmandocs  - install man pages generated by mandocs'
+        @echo  '  installmandocs  - install man pages generated by mandocs to INSTALL_MAN_PATH'; \
+         echo  '                    (default: $(INSTALL_MAN_PATH))'; \
+         echo  ''
         @echo  '  cleandocs       - clean all generated DocBook files'
         @echo
         @echo  '  make DOCBOOKS="s1.xml s2.xml" [target] Generate only docs s1.xml s2.xml'