Merge remote-tracking branch 'origin/master' into develop

7d048c71 · Mark Olesen · 91b0a937 · 638aded7 · 7d048c71
Commit 7d048c71 authored 8 years ago by Mark Olesen
--- a/applications/utilities/mesh/conversion/Optional/Allwmake
+++ b/applications/utilities/mesh/conversion/Optional/Allwmake
@@ -23,7 +23,7 @@ fi
 $WM_THIRD_PARTY_DIR/makeCCMIO lib

 if [ -e $CCMIO_ARCH_PATH/include/libccmio/ccmio.h \
-  -a \( -e $CCMIO_ARCH_PATH/lib/libccmio.a -o $FOAM_EXT_LIBBIN/libccmio.so \) ]
+  -a \( -e $CCMIO_ARCH_PATH/lib/libccmio.a -o -e $FOAM_EXT_LIBBIN/libccmio.so \) ]
 then
    wmake $targetType ccm26ToFoam
 else