Changeset 78145 in vbox for trunk

Timestamp:

Apr 16, 2019 2:17:30 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

130053

Message:

manual/Config.kmk: Catalog fix. Whitespace.

Location:

trunk/doc/manual

Files:

• Config.kmk (modified) (1 diff)
• Makefile.kmk (modified) (2 diffs)

trunk/doc/manual/Config.kmk

@@ -206 +206 @@
                 '  <delegateURI uriStartString="http://www.oasis-open.org/docbook/"         catalog="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_XML_CATALOG_DOCBOOK)"/>' \
                 '  <delegateSystem systemIdStartString="$(VBOX_PATH_MANUAL_SRC)"            catalog="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_XML_CATALOG_MANUAL)"/>' \
+                '  <delegateSystem systemIdStartString="$(VBOX_PATH_MANUAL_OUTBASE)"        catalog="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_XML_CATALOG_MANUAL)"/>' \
                 '  <delegateURI uriStartString="$(VBOX_PATH_MANUAL_SRC)"                    catalog="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_XML_CATALOG_MANUAL)"/>' \
-                '  <delegateURI uriStartString="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_MANUAL_SRC)" catalog="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_XML_CATALOG_MANUAL)"/>' \
                 '  <delegateURI uriStartString="$(VBOX_PATH_MANUAL_OUTBASE)"                catalog="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_XML_CATALOG_MANUAL)"/>' \
+                '  <delegateURI uriStartString="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_MANUAL_SRC)"     catalog="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_XML_CATALOG_MANUAL)"/>' \
+                '  <delegateURI uriStartString="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_PATH_MANUAL_OUTBASE)" catalog="file://$(VBOX_FILE_URL_MAYBE_SLASH)$(VBOX_XML_CATALOG_MANUAL)"/>' \
                 '</catalog>'
 

trunk/doc/manual/Makefile.kmk

@@ -185 +185 @@
  $(eval VBOX_MANUAL_XML_FILES_GENERATED_$$(lang) := \
         $$(addprefix $$(VBOX_PATH_MANUAL_OUTBASE)/$$(lang)/user_,$$(filter man_VBoxManage%,$$(VBOX_MANUAL_XML_REFENTRY_FILES))) \
-        $$(addprefix $$(VBOX_PATH_MANUAL_OUTBASE)/overview_,$$(filter man_VBoxManage%,$$(VBOX_MANUAL_XML_REFENTRY_FILES))) \
-        $$(VBOX_PATH_MANUAL_OUTBASE)/user_VBoxManage_CommandsOverview.xml \
+        $$(addprefix $$(VBOX_PATH_MANUAL_OUTBASE)/overview_,$$(filter man_VBoxManage%,$$(VBOX_MANUAL_XML_REFENTRY_FILES))) \
+        $$(VBOX_PATH_MANUAL_OUTBASE)/user_VBoxManage_CommandsOverview.xml \
         $$(VBOX_PATH_MANUAL_OUTBASE)/$$(lang)/user_isomakercmd-man.xml))
 
@@ -269 +269 @@
         $(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 \
-        \
+        $(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_LATEX_FILES_TARGET) \
-                SDKRef.pdf \
-                ) \
-    $(PATH_STAGE_BIN)/sdk/docs/SDKRef.pdf \
-        \
+                $(VBOX_SDKREF_LATEX_FILES_TARGET) \
+                SDKRef.pdf \
+                ) \
+        $(PATH_STAGE_BIN)/sdk/docs/SDKRef.pdf \
+        \
         $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/, \
-                $(VBOX_ACCESSIBILITY_LATEX_FILES_TARGET) \
-                html-single/Accessibility.html \
-                Accessibility.pdf \
-                ) \
-        $(PATH_STAGE_BIN)/Accessibility.html \
-        $(PATH_STAGE_BIN)/Accessibility.pdf \
-        \
-        $(VBOX_DOC_XIDL_SRC_TMP) \
-        $(VBOX_MANUAL_APIREF_TMP)
+                $(VBOX_ACCESSIBILITY_LATEX_FILES_TARGET) \
+                html-single/Accessibility.html \
+                Accessibility.pdf \
+                ) \
+        $(PATH_STAGE_BIN)/Accessibility.html \
+        $(PATH_STAGE_BIN)/Accessibility.pdf \
+        \
+        $(VBOX_DOC_XIDL_SRC_TMP) \
+        $(VBOX_MANUAL_APIREF_TMP)
 
 endif # if defined(VBOX_WITH_DOCS) && (!defined(VBOX_ONLY_BUILD) || defined(VBOX_ONLY_DOCS) || defined(VBOX_ONLY_SDK))