diff --git a/sit b/sit index d774ea5..a47b7fd 100755 --- a/sit +++ b/sit @@ -168,12 +168,11 @@ PACKAGENAME=${PACKAGENAME:=$PACKAGE} # construct the final installation directory path if [ -z $PREFIX ] ; then -PREFIX="${PREFIX_BASE}/${CATEGORY}/${PACKAGE}/${VERSION}" -PREFIX_SUFFIX=${MPI:+"-$MPI"}${MPI_VERSION_NUM:+"-$MPI_VERSION_NUM"} -PREFIX_SUFFIX=$PREFIX_SUFFIX${COMPILER:+"-$COMPILER"}${COMPILER_VERSION:+"-$COMPILER_VERSION"} -PREFIX_SUFFIX=$PREFIX_SUFFIX${PACKAGE_DESCRIPTOR:+-$PACKAGE_DESCRIPTOR} - -PREFIX=$PREFIX${PREFIX_SUFFIX:+"$PREFIX_SUFFIX"} + PREFIX="${PREFIX_BASE}/${CATEGORY}/${PACKAGE}/${VERSION}" + PREFIX_SUFFIX=${MPI:+"-$MPI"}${MPI_VERSION_NUM:+"-$MPI_VERSION_NUM"} + PREFIX_SUFFIX=$PREFIX_SUFFIX${COMPILER:+"-$COMPILER"}${COMPILER_VERSION:+"-$COMPILER_VERSION"} + PREFIX_SUFFIX=$PREFIX_SUFFIX${PACKAGE_DESCRIPTOR:+-$PACKAGE_DESCRIPTOR} + PREFIX=$PREFIX${PREFIX_SUFFIX:+"$PREFIX_SUFFIX"} fi # final working directory path @@ -212,8 +211,8 @@ if [[ -d ${WORKDIR} && -z $sit_action ]] ; then fi if [ ! -d ${WORKDIR} ] ; then - mkdir -p ${WORKDIR} - mkdir -p ${BUILDDIR} + mkdir -p ${WORKDIR} + mkdir -p ${BUILDDIR} fi if [ ! -z ${LOGDIR} ] ; then