Changeset 56346 in vbox

Timestamp:

Jun 10, 2015 11:11:44 PM (10 years ago)

Author:

vboxsync

Message:

build fix

Location:

trunk

Files:

• Makefile.kmk (modified) (1 diff)
• doc/manual/Makefile.kmk (modified) (7 diffs)

trunk/Makefile.kmk

@@ -23 +23 @@
 #
 ifndef VBOX_ONLY_ROOT_MAKEFILE
- if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))
+ if  (defined(VBOX_WITH_DOCS) || defined(VBOX_WITH_MAIN) \
+  && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))
   include $(PATH_SUB_CURRENT)/doc/manual/Makefile.kmk
  endif

trunk/doc/manual/Makefile.kmk

@@ -161 +161 @@
 
 
+## List of refentry files (manpages).
+VBOX_MANUAL_XML_REFENTRY_FILES = \
+        man_VBoxManage_extpack.xml
+
 
 #
@@ -168 +172 @@
 BLDDIRS += $(VBOX_PATH_MANUAL_OUTBASE)
 
-ifdef VBOX_WITH_DOCS
+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.
@@ -238 +242 @@
  VBOX_MANUAL_XML_FILES_INCL_CHANGELOG = $(VBOX_MANUAL_XML_FILES) \
         user_ChangeLog.xml
-
- VBOX_MANUAL_XML_REFENTRY_FILES = \
-        man_VBoxManage_extpack.xml
 
  VBOX_SDKREF_XML_FILES = \
@@ -317 +318 @@
         $(PATH_STAGE_BIN)/sdk/docs/SDKRef.pdf
 
-endif # VBOX_WITH_DOCS
+endif # if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))
 
 
@@ -384 +385 @@
 
 
+if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))
+
+
 ##########################################################################################
 #
@@ -830 +834 @@
 html-zip:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.zip
 
+
 ##########################################################################################
 #
@@ -859 +864 @@
 
 cl-html: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/ChangeLog.html
+
+
+
+endif # if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))