Changeset 86673 in vbox

Timestamp:

Oct 22, 2020 4:01:45 PM (4 years ago)

Author:

vboxsync

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

141051

Message:

FE/Qt: bugref:9831. Changing the build directory of the htmlhelp stuff we use for qhelp

File:

• trunk/doc/manual/Makefile.kmk (modified) (5 diffs)

trunk/doc/manual/Makefile.kmk

@@ -232 +232 @@
                 $(addsuffix /html-single, $(VBOX_MANUAL_LANGUAGES)) \
                 $(addsuffix /html-chunks, $(VBOX_MANUAL_LANGUAGES)) \
+                $(addsuffix /qhelp, $(VBOX_MANUAL_LANGUAGES)) \
+                $(addsuffix /qhelp/images, $(VBOX_MANUAL_LANGUAGES)) \
                 $(addsuffix /HTMLHelp, $(VBOX_MANUAL_LANGUAGES)) \
                 $(addsuffix /HTMLHelp/images, $(VBOX_MANUAL_LANGUAGES)) \
@@ -842 +844 @@
 qhelp:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.qhc
 html-zip:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/UserManual.zip
-hhp:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/HTMLHelp/htmlhelp.hhp
+hhp:: $(VBOX_PATH_MANUAL_OUTBASE)/en_US/qhelp/htmlhelp.hhp
 
 #
@@ -905 +907 @@
 , $(evalcall2 def_vbox_refentry_to_manpage,$(lang),$(file))))
 
-$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/HTMLHelp/,$(VBOX_MANUAL_PNG_FILES_en_US)): \
-                $(VBOX_PATH_MANUAL_OUTBASE)/en_US/HTMLHelp/%: $(VBOX_PATH_MANUAL_SRC)/en_US/% | $$(dir $$@)
+$(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/qhelp/,$(VBOX_MANUAL_PNG_FILES_en_US)): \
+                $(VBOX_PATH_MANUAL_OUTBASE)/en_US/qhelp/%: $(VBOX_PATH_MANUAL_SRC)/en_US/% | $$(dir $$@)
         $(call MSG_L1,Copying temporary $< => $@)
         $(QUIET)$(INSTALL_STAGING) -m0644 -- '$<' '$(@D)'
@@ -917 +919 @@
         $(QUIET)$(MV) -f [email protected] $@
 
-$(VBOX_PATH_MANUAL_OUTBASE)/en_US/HTMLHelp/htmlhelp.hhp: \
+$(VBOX_PATH_MANUAL_OUTBASE)/en_US/qhelp/htmlhelp.hhp: \
                 $(addprefix $(VBOX_PATH_MANUAL_SRC)/en_US/,$(VBOX_MANUAL_XML_FILES)) \
                 $(VBOX_MANUAL_XML_FILES_COMMON) \
@@ -926 +928 @@
                 $(VBOX_XML_CATALOG) $$(VBOX_XML_CATALOG_DOCBOOK) $(VBOX_XML_CATALOG_MANUAL) \
                 $(VBOX_XML_ENTITIES) \
-                $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/HTMLHelp/,$(VBOX_MANUAL_PNG_FILES_en_US)) | $$(dir $$@)
+                $(addprefix $(VBOX_PATH_MANUAL_OUTBASE)/en_US/qhelp/,$(VBOX_MANUAL_PNG_FILES_en_US)) | $$(dir $$@)
         $(call MSG_TOOL,xsltproc $(notdir $(firstword $(filter %.xsl,$$^))),,$(firstword $(filter %.xml,$^)),$@)
         $(QUIET)$(RM) -f $@