Ensure build tests use the system provided $(MAKE) variable to determine the command...

[pub/USBasp.git] / LUFA / Build / lufa.doxygen.in

diff --git a/LUFA/Build/lufa.doxygen.in b/LUFA/Build/lufa.doxygen.in
index 26cd40d..13055fc 100644 (file)
--- a/LUFA/Build/lufa.doxygen.in
+++ b/LUFA/Build/lufa.doxygen.in
@@ -35,18 +35,20 @@ LUFA_BUILD_OPTIONAL_VARS  += DOXYGEN_CONF DOXYGEN_FAIL_ON_WARNING DOXYGEN_OVERRI
 #                                configuration file\r
 # -----------------------------------------------------------------------------\r
 \r
-# Output Messages\r
-MSG_DOXYGEN_CMD   = '  [DOXYGEN] :'\r
-\r
-# Default values of user-supplied variables\r
+# Default values of optionally user-supplied variables\r
 DOXYGEN_CONF            ?= Doxygen.conf\r
 DOXYGEN_FAIL_ON_WARNING ?= Y\r
 DOXYGEN_OVERRIDE_PARAMS ?= QUIET=YES\r
 \r
+# Output Messages\r
+MSG_DOXYGEN_CMD          = ' [DOXYGEN] :'\r
+\r
 # Determine Doxygen invocation command\r
-DOXYGEN_CMD = ( cat Doxygen.conf ; $(DOXYGEN_OVERRIDE_PARAMS:%=echo "%";)) | doxygen -\r
+BASE_DOXYGEN_CMD = ( cat Doxygen.conf ; $(DOXYGEN_OVERRIDE_PARAMS:%=echo "%") ) | doxygen -\r
 ifeq ($(DOXYGEN_FAIL_ON_WARNING), Y)\r
-    DOXYGEN_CMD = if ( ( cat Doxygen.conf $(DOXYGEN_OVERRIDE_PARAMS:%=; echo "%") ) | doxygen - 2>&1 | grep -v "warning: ignoring unsupported tag" ;); then exit 1; fi;\r
+    DOXYGEN_CMD = if ( $(BASE_DOXYGEN_CMD) 2>&1 | grep -v "warning: ignoring unsupported tag" ;); then exit 1; fi;\r
+else\r
+    DOXYGEN_CMD = $(BASE_DOXYGEN_CMD)\r
 endif\r
 \r
 doxygen:\r