fixed syntax bugs

This commit is contained in:
Philip Eisenlohr 2014-01-22 16:03:27 +00:00
parent e6d88e4458
commit 380f6e1ec5
2 changed files with 8 additions and 8 deletions

View File

@ -9,7 +9,7 @@ spectral:
.PHONY : marc .PHONY : marc
marc: marc:
@./installation/mods_Marc/apply_DAMASK_modifcations.sh ${MAKEFLAGS} @./installation/mods_MarcMentat/apply_DAMASK_modifications.sh ${MAKEFLAGS}
.PHONY : processing .PHONY : processing
processing: processing:

View File

@ -2,9 +2,9 @@
DEFAULT_VERSION='2013.1' DEFAULT_VERSION='2013.1'
WORKINGDIR=`dirname $0` WORKINGDIR="$( cd "$( dirname "$0" )" && pwd )"
source ../options source $WORKINGDIR/../options
while [ ! -d "$WORKINGDIR/$VERSION" ] || [ -z "$VERSION" ] while [ ! -d "$WORKINGDIR/$VERSION" ] || [ -z "$VERSION" ]
do do
@ -16,8 +16,8 @@ do
done done
echo "MSC version: $VERSION" echo "MSC version: $VERSION"
if [ "x$MSC_ROOT" != "x" ] if [ "x$MSC_ROOT" != "x" ]; then
then INSTALLDIR=$MSC_ROOT INSTALLDIR=$MSC_ROOT
fi fi
while [ ! -d "$INSTALLDIR" ] || [ -z "$INSTALLDIR" ] while [ ! -d "$INSTALLDIR" ] || [ -z "$INSTALLDIR" ]
@ -31,15 +31,15 @@ echo "MSC installation path: $INSTALLDIR"
BLASDIR='' BLASDIR=''
BLASTYPE='' BLASTYPE=''
if [ "x$LAPACK_ROOT" != "x" ] if [ "x$LAPACK_ROOT" != "x" ]; then
BLASDIR=$LAPACK_ROOT BLASDIR=$LAPACK_ROOT
BLASTYPE='LAPACK' BLASTYPE='LAPACK'
fi fi
if [ "x$ACML_ROOT" != "x" ] if [ "x$ACML_ROOT" != "x" ]; then
BLASDIR=$ACML_ROOT BLASDIR=$ACML_ROOT
BLASTYPE='ACML' BLASTYPE='ACML'
fi fi
if [ "x$IMKL_ROOT" != "x" ] if [ "x$IMKL_ROOT" != "x" ]; then
BLASDIR=$IMKL_ROOT BLASDIR=$IMKL_ROOT
BLASTYPE='IMKL' BLASTYPE='IMKL'
fi fi