Index: /trunk/doc/manual/Makefile.kmk
===================================================================
--- /trunk/doc/manual/Makefile.kmk	(revision 68351)
+++ /trunk/doc/manual/Makefile.kmk	(revision 68352)
@@ -1,5 +1,5 @@
 # $Id$
 ## @file
-# Sub-Makefile for the VBox User Manual.
+# Sub-Makefile for the VirtualBox User Manual, SDK reference and other manuals.
 #
 
@@ -205,12 +205,18 @@
 if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))
  if defined(VBOX_ONLY_SDK) || defined(VBOX_WITH_DOCS_SDKREF)
-  ## @todo make this an install target, drop the BLDDIRS.
-  OTHERS += \
-  	$(VBOX_PATH_SDK)/docs/SDKRef.pdf
-  BLDDIRS += \
-  	$(VBOX_PATH_SDK)/docs
+  INSTALLS += VBox-sdkref-docs
+  VBox-sdkref-docs_INST = $(INST_SDK)docs/
+  VBox-sdkref-docs_MODE = a+r,u+w
+  VBox-sdkref-docs_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/SDKRef.pdf
+  VBox-sdkref-docs_CLEAN = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/SDKRef.pdf
  endif
 
  ifdef VBOX_WITH_DOCS_CHM
+  INSTALLS += VBox-usermanual-chm-docs
+  VBox-usermanual-chm-docs_INST = $(INST_BIN)
+  VBox-usermanual-chm-docs_MODE = a+r,u+w
+  VBox-usermanual-chm-docs_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/VirtualBox.chm
+  VBox-usermanual-chm-docs_CLEAN = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/VirtualBox.chm
+
   VBOX_PATH_BIN_CHM = $(PATH_STAGE_BIN)/VirtualBox.chm
  else  # Do not build chm.
@@ -222,19 +228,26 @@
   		$(PATH_STAGE_BIN)/UserManual.pdf \
   		$(VBOX_PATH_BIN_CHM)
-  OTHERS += \
-  	$(PATH_STAGE_BIN)/UserManual.pdf
-  OTHERS.win += \
-  	$(VBOX_PATH_BIN_CHM)
-  OTHERS.linux += \
-  	$(VBOX_PATH_BIN_CHM)
+  INSTALLS += VBox-usermanual-docs
+  VBox-usermanual-docs_INST = $(INST_BIN)
+  VBox-usermanual-docs_MODE = a+r,u+w
+  VBox-usermanual-docs_SOURCES = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.pdf
+  VBox-usermanual-docs_CLEAN = $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.pdf
 
   ifdef VBOX_WITH_DOCS_TRANSLATIONS
-   OTHERS += \
-   	$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/UserManual_$(f).pdf)
+   INSTALLS += VBox-usermanual-add-docs
+   VBox-usermanual-add-docs_INST = $(INST_BIN)
+   VBox-usermanual-add-docs_MODE = a+r,u+w
+   VBox-usermanual-add-docs_SOURCES = $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$(f)/UserManual.pdf=>UserManual_$(f).pdf)
+   VBox-usermanual-add-docs_CLEAN = $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$(f)/UserManual.pdf)
+   VBOX_MANUAL_PACK += \
+ 	$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/UserManual_$(f).pdf)
    ifdef VBOX_WITH_DOCS_CHM
-   OTHERS.win += \
-   	$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/VirtualBox_$(f).chm)
-   OTHERS.linux += \
-   	$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/VirtualBox_$(f).chm)
+    INSTALLS += VBox-usermanual-add-chm-docs
+   VBox-usermanual-add-chm-docs_INST = $(INST_BIN)
+   VBox-usermanual-add-chm-docs_MODE = a+r,u+w
+   VBox-usermanual-add-chm-docs_SOURCES = $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$(f)/VirtualBox.chm=>VirtualBox_$(f).chm)
+   VBox-usermanual-add-chm-docs_CLEAN = $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$(f)/VirtualBox.chm)
+    VBOX_MANUAL_PACK += \
+ 	$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/VirtualBox_$(f).chm)
    endif
   endif
@@ -298,9 +311,4 @@
  		$(addsuffix /HTMLHelp/images, $(VBOX_MANUAL_LANGUAGES)) \
  	)
-
- ifdef VBOX_WITH_DOCS_CHM
- VBOX_MANUAL_PACK += \
- 	$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/UserManual_$(f).pdf $(PATH_STAGE_BIN)/VirtualBox_$(f).chm)
- endif
 
  OTHER_CLEAN += \
@@ -332,25 +340,17 @@
                HTMLHelp/htmlhelp.hhp \
  		titlepage-htmlhelp.xsl \
-		UserManual.pdf \
-		VirtualBox.chm \
-               ChangeLog.html \
-               validatemanual.run \
+		ChangeLog.html \
+		validatemanual.run \
 		)) \
  	$(VBOX_PATH_MANUAL_OUTBASE)/$(VBOX_MANUAL_XML_CHANGELOG) \
  	$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/overview_,$(VBOX_MANUAL_XML_REFENTRY_FILES)) \
  	$(VBOX_PATH_MANUAL_OUTBASE)/user_VBoxManage_CommandsOverview.xml \
- 	$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/UserManual_$(f).pdf) \
- 	$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/VirtualBox_$(f).chm) \
- 	$(PATH_STAGE_BIN)/UserManual.pdf \
- 	$(PATH_STAGE_BIN)/VirtualBox.chm \
        \
  	$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/, \
 		$(VBOX_SDKREF_XML_FILES) \
 		$(VBOX_SDKREF_LATEX_FILES_TARGET) \
-		SDKRef.pdf \
 		) \
 	$(VBOX_DOC_XIDL_SRC_TMP) \
-	$(VBOX_MANUAL_APIREF_TMP) \
- 	$(PATH_STAGE_BIN)/sdk/docs/SDKRef.pdf
+	$(VBOX_MANUAL_APIREF_TMP)
 
 endif # if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))
@@ -557,14 +557,4 @@
 ##########################################################################################
 
-## @todo INSTALLS target for this!
-$(PATH_STAGE_BIN)/UserManual.pdf: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.pdf | $$(dir $$@)
-	$(QUIET)$(CP) $< $@
-	$(call MSG_L1,Fresh LaTeX-generated PDF is now at $@)
-
-$(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/UserManual_$(f).pdf): \
-	$(PATH_STAGE_BIN)/UserManual_%.pdf : $(VBOX_PATH_MANUAL_OUTBASE)/%/UserManual.pdf
-	$(QUIET)$(CP) $< $@
-	$(call MSG_L1,Fresh LaTeX-generated PDF is now at $@)
-
 $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/UserManual.pdf): \
 		$(VBOX_PATH_MANUAL_OUTBASE)/%/UserManual.pdf : \
@@ -583,6 +573,5 @@
 		-e '/Warning: There were \(undefined references\|multiply-defined labels\)/{p; q 1}' \
 		$(basename $@).log
-
-##@todo restore this when above has been converted to INSTALLS target.	$(call MSG_L1,Fresh LaTeX-generated PDF is now at $@)
+	$(call MSG_L1,Fresh LaTeX-generated PDF is now at $@)
 
 # generate temporary LaTeX source from processed XML
@@ -679,5 +668,5 @@
 
 # Turn SDKRef.tex into a PDF.
-$(VBOX_PATH_SDK)/docs/SDKRef.pdf: \
+$(VBOX_PATH_MANUAL_OUTBASE)/en_US/SDKRef.pdf: \
 		$(VBOX_PATH_MANUAL_OUTBASE)/en_US/SDKRef.tex \
 		$(if $(VBOX_OSE),,$(VBOX_PATH_MANUAL_OUTBASE)/en_US/ucs.sty) \
@@ -692,5 +681,4 @@
 		-e '/Warning: There were \(undefined references\|multiply-defined labels\)/{p; q 1}' \
 		$(basename $<).log
-	$(QUIET)$(CP) $(<D)/SDKRef.pdf $@
 	$(call MSG_L1,Fresh LaTeX-generated PDF is now at $@)
 
@@ -716,13 +704,4 @@
  	$(VBOX_PATH_MANUAL_SRC)/common-html-formatcfg.xsl
 
- $(PATH_STAGE_BIN)/VirtualBox.chm: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/VirtualBox.chm
-	$(QUIET)$(CP) $< $@
-	$(call MSG_L1,Fresh CHM is now at $@)
-
- $(foreach f,$(VBOX_MANUAL_ADD_LANGUAGES),$(PATH_STAGE_BIN)/VirtualBox_$(f).chm): \
-	$(PATH_STAGE_BIN)/VirtualBox_%.chm : $(VBOX_PATH_MANUAL_OUTBASE)/%/VirtualBox.chm
-	$(QUIET)$(CP) $< $@
-	$(call MSG_L1,Fresh CHM is now at $@)
-
  $(foreach f,$(VBOX_MANUAL_LANGUAGES),$(VBOX_PATH_MANUAL_OUTBASE)/$f/VirtualBox.chm): \
 		$(VBOX_PATH_MANUAL_OUTBASE)/%/VirtualBox.chm: \
@@ -732,4 +711,5 @@
 	$(QUIET)$(RM) -f $@
 	$(QUIET)$(VBOX_HHC) $(subst /,\\,$<)
+	$(call MSG_L1,Fresh CHM is now at $@)
 
  # Prepare the XSL file for our title page, htmlhelp variant.