From ff3562dc78c0804d4123fc9a9e3c0021ad57ebd3 Mon Sep 17 00:00:00 2001 From: Christoph Niethammer Date: Mon, 2 May 2016 08:55:19 +0000 Subject: [PATCH] Do not modify the provided PACKAGE_DESCRIPTOR variable. --- sit | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/sit b/sit index d72a5a2..83008d3 100755 --- a/sit +++ b/sit @@ -68,10 +68,6 @@ COMPILER=${COMPILER:=${DEFAULT_COMPILER}} COMPILER_VERSION=${COMPILER_VERSION:=} -# add a descriptor at the end of the installation path e.g. for special config options etc. -PACKAGE_DESCRIPTOR=${PACKAGE_DESCRIPTOR:+-$PACKAGE_DESCRIPTOR} - - # Compiler specifications COMPILER_CONFIG_FILE="$SIT_PATH/etc/platform-configs/${PLATFORM}/compiler/${COMPILER}" if [ -e $COMPILER_CONFIG_FILE ] ; then @@ -179,7 +175,7 @@ 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} +PREFIX_SUFFIX=$PREFIX_SUFFIX${PACKAGE_DESCRIPTOR:+-$PACKAGE_DESCRIPTOR} PREFIX=$PREFIX${PREFIX_SUFFIX:+"$PREFIX_SUFFIX"} fi