Minor cleanup
Minor cleanup

When JAVA_HOME is empty or "NO_JAVA_HOME" don't use such paths in ILIB
or SOLARINC. Use $INCLUDE consistently everywhere instead of
$ds."include". Avoid duplicating the DirectX include in SOLARINC.

JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core,JurassicWordExcel/core