Changeset 63841 in vbox for trunk

Timestamp:

Sep 14, 2016 7:14:02 PM (8 years ago)

Author:

vboxsync

Message:

manual/Makefile.kmk: Don't use REDIRECT twice.

File:

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

trunk/doc/manual/Makefile.kmk

@@ -101 +101 @@
 # xsltproc with the catalog trick if applicable.
 ifdef VBOX_XML_CATALOG
- VBOX_XSLTPROC_WITH_CAT    = $(REDIRECT) -E "XML_CATALOG_FILES=$(VBOX_XML_CATALOG)" -- \
+ VBOX_XSLTPROC_WITH_CAT    = $(REDIRECT) -E "XML_CATALOG_FILES=$(VBOX_XML_CATALOG)" $1 -- \
         $(VBOX_XSLTPROC) --nonet --xinclude $(VBOX_XSLTPROC_OPTS)
  VBOX_XMLLINT_WITH_CAT     = $(REDIRECT) -E "XML_CATALOG_FILES=$(VBOX_XML_CATALOG)" -- \
         $(VBOX_XMLLINT) --nonet --xinclude --noout $(VBOX_XMLLINT_OPTS)
 else
- VBOX_XSLTPROC_WITH_CAT    = $(VBOX_XSLTPROC) --nonet --xinclude $(VBOX_XSLTPROC_OPTS)
+ VBOX_XSLTPROC_WITH_CAT    = $(if $(1), $(REDIRECT) $1 --,,) $(VBOX_XSLTPROC) --nonet --xinclude $(VBOX_XSLTPROC_OPTS)
  VBOX_XMLLINT_WITH_CAT     = $(VBOX_XMLLINT) --nonet --xinclude --noout $(VBOX_XMLLINT_OPTS)
 endif
@@ -477 +477 @@
         $$(call MSG_TOOL,xsltproc $$(notdir $$(filter %.xsl,$$^)),,$$(filter %.xml,$$^),$$@)
         $$(QUIET)$$(RM) -f "$$@"
-        $$(QUIET)$$(VBOX_XSLTPROC_WITH_CAT) --output $$@ $$(VBOX_PATH_MANUAL_SRC)/docbook-refentry-to-manual-sect1.xsl $$<
+        $$(QUIET)$$(call VBOX_XSLTPROC_WITH_CAT) --output $$@ $$(VBOX_PATH_MANUAL_SRC)/docbook-refentry-to-manual-sect1.xsl $$<
 endef
 $(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(foreach file,$(VBOX_MANUAL_XML_REFENTRY_FILES) \
@@ -491 +491 @@
                | $$(dir $$@)
         $(call MSG_TOOL,xsltproc $(notdir $(filter %.xsl,$^)),,$(firstword $(filter %.xml,$^)),$@)
-        $(QUIET)$(VBOX_XSLTPROC_WITH_CAT) --output "$@" $< $(filter %.xml,$^)
+        $(QUIET)$(call VBOX_XSLTPROC_WITH_CAT) --output "$@" $< $(filter %.xml,$^)
 
 $(VBOX_PATH_MANUAL_OUTBASE)/user_VBoxManage_CommandsOverview.xml: $(VBOXMANAGEHELP_PATH) $(MAKEFILE_CURRENT) | $$(dir $$@)
@@ -598 +598 @@
 #   pass current language to xsltproc in TARGETLANG variable (extract it from the
 #   current directory, should become "de_DE" or the like)
-        $(QUIET)$(VBOX_XSLTPROC_WITH_CAT) --stringparam TARGETLANG $(notdir $(@D)) \
+        $(QUIET)$(call VBOX_XSLTPROC_WITH_CAT) --stringparam TARGETLANG $(notdir $(@D)) \
                 -o [email protected] $(VBOX_PATH_MANUAL_SRC)/docbook2latex.xsl $<
 #   for pretty quotes, replace " with `` or '' depending on whether it's at the start of a word;
@@ -666 +666 @@
 #endif
 #       generate TeX source from processed docbook and store it in SDKRef.tex.tmp
-        $(QUIET)$(VBOX_XSLTPROC_WITH_CAT) --stringparam TARGETLANG en_US \
+        $(QUIET)$(call VBOX_XSLTPROC_WITH_CAT) --stringparam TARGETLANG en_US \
                 -o [email protected] $(VBOX_PATH_MANUAL_SRC)/docbook2latex.xsl $<
 #       for pretty quotes, replace " with `` or '' depending on whether it's at the start of a word;
@@ -751 +751 @@
         $(QUIET)$(RM) -f $@
         $(QUIET)$(MKDIR) -p $(@D)
-        $(QUIET)$(VBOX_XSLTPROC_WITH_CAT) --output $(@D)/ \
+        $(QUIET)$(call VBOX_XSLTPROC_WITH_CAT) --output $(@D)/ \
                 --stringparam htmlhelp.chm \
                 $(subst /,\\,$(@D)/../VirtualBox.chm) \
@@ -800 +800 @@
                 | $$(dir $$@)
         $(call MSG_TOOL,xsltproc $(notdir $(firstword $(filter %.xsl,$^))),,$(firstword $(filter %.xml,$^)),$@)
-        $(QUIET)$(VBOX_XSLTPROC_WITH_CAT) \
+        $(QUIET)$(call VBOX_XSLTPROC_WITH_CAT) \
                 --output $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-single/UserManual.html \
                 $(VBOX_PATH_MANUAL_OUTBASE)/en_US/docbook-html-one-page-formatcfg.xsl \
@@ -813 +813 @@
                 | $$(dir $$@)
         $(call MSG_TOOL,xsltproc $(notdir $(firstword $(filter %.xsl,$^))),,$(firstword $(filter %.xml,$^)),$@)
-        $(QUIET)$(VBOX_XSLTPROC_WITH_CAT) \
+        $(QUIET)$(call VBOX_XSLTPROC_WITH_CAT) \
                 --output $(VBOX_PATH_MANUAL_OUTBASE)/en_US/html-chunks/index.html \
                 --stringparam chunk.section.depth 0 \
@@ -846 +846 @@
                 $(VBOX_XML_CATALOG) $(VBOX_XML_CATALOG_DOCBOOK) | $$(dir $$@)
         $(call MSG_TOOL,xsltproc $(notdir $(firstword $(filter %.xsl,$^))),,$(firstword $(filter %.xml,$^)),$@)
-        $(QUIET)$(VBOX_XSLTPROC_WITH_CAT) --output "$@" "$<" $(filter %.xml,$^)
+        $(QUIET)$(call VBOX_XSLTPROC_WITH_CAT) --output "$@" "$<" $(filter %.xml,$^)
         $(call MSG_L1,Fresh ChangeLog.html is now at $@)
 
@@ -875 +875 @@
         $$(call MSG_TOOL,xsltproc $$(notdir $$(firstword $$(filter %.xsl,$$^))),,$$(firstword $$(filter %.xml,$$^)),$$@)
         $$(QUIET)$$(RM) -f "$$@"
-        $$(QUIET)$$(VBOX_XSLTPROC_WITH_CAT) --output $$@ \
+        $$(QUIET)$$(call VBOX_XSLTPROC_WITH_CAT) --output $$@ \
                 $$(VBOX_PATH_MANUAL_SRC)/docbook-refentry-to-manpage-preprocessing.xsl $$<
 if defined(VBOX_HAVE_XMLLINT) && "$(USER)" == "bird" # Effing stuff happends on build servers, probably kmk related...
@@ -888 +888 @@
         $$(call MSG_TOOL,xsltproc $$(notdir $$(firstword $$(filter %.xsl,$$^))),,$$(firstword $$(filter %.xml,$$^)),$$@)
         $$(QUIET)$$(RM) -f "$$@"
-        $$(QUIET)$$(VBOX_XSLTPROC_WITH_CAT) --output $$@ $$(VBOX_PATH_MANUAL_OUTBASE)/docbook-refentry-to-manpage.xsl $$<
+        $$(QUIET)$$(call VBOX_XSLTPROC_WITH_CAT) --output $$@ $$(VBOX_PATH_MANUAL_OUTBASE)/docbook-refentry-to-manpage.xsl $$<
 endef
 $(foreach lang,$(VBOX_MANUAL_LANGUAGES),$(foreach file,$(VBOX_MANUAL_XML_REFENTRY_FILES) \
@@ -936 +936 @@
                 ''
         $(foreach refentry,$(filter %.xml,$^) \
-        ,$(NLTAB)$(QUIET)$(REDIRECT) -a+to "$@" -- $(VBOX_XSLTPROC_WITH_CAT) $< $(refentry))
+        ,$(NLTAB)$(QUIET)$(call VBOX_XSLTPROC_WITH_CAT, -a+to "$@") $< $(refentry))
         $(QUIET)$(APPEND) -n "$@" \
         '' \
@@ -972 +972 @@
                '    HELP_CMD_VBOXMANAGE_INVALID = 0,'
         $(foreach refentry,$(filter %.xml,$^) \
-        ,$(NLTAB)$(QUIET)$(REDIRECT) -a+to "$@" -- $(VBOX_XSLTPROC_WITH_CAT) \
+        ,$(NLTAB)$(QUIET)$(call VBOX_XSLTPROC_WITH_CAT, -a+to "$@") \
                 --stringparam 'g_sMode' 'cmd' $< $(refentry))
         $(QUIET)$(APPEND) -n "$@" \
@@ -978 +978 @@
                 '} HELP_CMD_VBOXMANAGE;'
         $(foreach refentry,$(filter %.xml,$^) \
-        ,$(NLTAB)$(QUIET)$(REDIRECT) -a+to "$@" -- $(VBOX_XSLTPROC_WITH_CAT) \
+        ,$(NLTAB)$(QUIET)$(call VBOX_XSLTPROC_WITH_CAT, -a+to "$@") \
                 --stringparam 'g_sMode' 'subcmd' $< $(refentry))
         $(QUIET)$(APPEND) -n "$@" \