Commit 49cb54a0 authored by Mark Olesen's avatar Mark Olesen
Browse files

Merge commit 'origin/master' into olesenm

parents e5f0dd3e e0d3735b
......@@ -157,7 +157,8 @@ then
exit $?
elif [ ! -d $MakeDir ]
then
$make -k -f $WM_DIR/MakefileApps FOAM_APPS="`find . -maxdepth 1 \( -type d -a ! -name "." -a ! -name ".svn" -a ! -name "Make" \) -printf "%f "`"
$make -k -f $WM_DIR/MakefileApps \
FOAM_APPS="`find . -maxdepth 1 \( -type d -a ! -name "." -a ! -name "Optional" -a ! -name "Make" \) -printf "%f "`"
exit $?
fi
......
......@@ -126,7 +126,7 @@ echo
cd $incDir
find .. $findOpt \
\( -name lnInclude -o -name -Make -o -name .svn -o -name config \) -prune \
\( -name lnInclude -o -name -Make -o -name config \) -prune \
-o \( -name '*.[CHh]' -o -name '*.[ch]xx' -o -name '*.[ch]pp' -o -name '*.type' \) \
-a ! -name ".#*" \
-exec ln $lnOpt {} . \;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment