Changeset 67175 in vbox for trunk/doc

Timestamp:

May 31, 2017 2:38:02 PM (8 years ago)

Author:

vboxsync

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

115851

Message:

bugref:8524: Additions/linux: play nicely with distribution-installed Additions
[PATCH 2/3] additions/linux/drm: Remove unnecessary wrapping of guest_pool in a struct
Signed-off-by: Hans de Goede <hdegoede@…>

File:

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

trunk/doc/manual/Makefile.kmk

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