Fix tests for empty strings in _setup

If a macro like OLD_JAVA_HOME expands to nothing, the resulting
command (if [ ]; then ...) is considered syntactically invalid by
some versions of bash. This avoids that problem by letting make
evaluate the test by using $(if).

Signed-off-by: Keith W. Campbell <[email protected]>

Author: keithc-ca

settings.mk

@@ -380,19 +380,12 @@ setup_%: testEnvSetup
 	@$(ECHO) set JDK_IMPL to $(JDK_IMPL)
 	@$(ECHO) set JVM_VERSION to $(JVM_VERSION)
 	@$(ECHO) set JCL_VERSION to $(JCL_VERSION)
-	@if [ $(OLD_JAVA_HOME) ]; then \
-		$(ECHO) JAVA_HOME was originally set to $(OLD_JAVA_HOME); \
-	fi
+	@$(if $(OLD_JAVA_HOME),$(ECHO) JAVA_HOME was originally set to $(OLD_JAVA_HOME))
 	@$(ECHO) set JAVA_HOME to $(JAVA_HOME)
 	@$(ECHO) set SPEC to $(SPEC)
 	@$(ECHO) set TEST_FLAG to $(TEST_FLAG)
-	@if [ $(MICROARCH) ]; then \
-		$(ECHO) set MICROARCH to $(MICROARCH); \
-	fi
-	@if [ $(OS_LABEL) ]; then \
-		$(ECHO) set OS_LABEL to $(OS_LABEL); \
-	fi
-
+	@$(if $(MICROARCH),$(ECHO) set MICROARCH to $(MICROARCH))
+	@$(if $(OS_LABEL),$(ECHO) set OS_LABEL to $(OS_LABEL))
 	@$(MKTREE) $(Q)$(TESTOUTPUT)$(Q)
 	@$(CP) $(Q)$(TEST_ROOT)$(D)TKG$(D)SHAs.txt$(Q) $(Q)$(TESTOUTPUT)$(D)$(Q)
 	@$(ECHO) Running $(TESTTARGET) ...