Changeset 67178 in vbox for trunk/doc/manual

Timestamp:

May 31, 2017 3:03:08 PM (8 years ago)

Author:

vboxsync

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

115854

Message:

bugref:8524: Additions/linux: play nicely with distribution-installed Additions
Revert unwanted additional file commit.

File:

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

trunk/doc/manual/Makefile.kmk

@@ -133 +133 @@
 endif
 
-# FreePascal chm compiler
-VBOX_HHC = chmcmd
+# Windows HTML Help Workshop compiler (stupid thing always returns an error!)
+VBOX_HHC = -$(EXEC_X86_WIN32) $(VBOX_PATH_HTML_HELP_WORKSHOP)/hhc.exe
+
 
 # Additional xsltproc options when generating
@@ -729 +730 @@
         $(call MSG_L1,hhc $<,=> $@)
         $(QUIET)$(RM) -f $@
-        $(QUIET)cd $(dir $<); $(VBOX_HHC) $<; chmod 0644 $@
+        $(QUIET)$(VBOX_HHC) $(subst /,\\,$<)
 
  # Prepare the XSL file for our title page, htmlhelp variant.
@@ -752 +753 @@
         $(QUIET)$(call VBOX_XSLTPROC_WITH_CAT) --output $(@D)/ \
                 --stringparam htmlhelp.chm \
-                $(@D)/../VirtualBox.chm \
+                $(subst /,\\,$(@D)/../VirtualBox.chm) \
                 $(HTMLHELPOPTS) $(@D)/../docbook-htmlhelp-formatcfg.xsl \
                 $<