-export PRODUCT="GEOM_${VERSION}"
-export PRODUCT_SRC="GEOM_SRC_${VERSION}"
-export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
-export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC}
-source ./common.sh
+if [ -n "$SINGLE_DIR" ] ; then SINGLE_DIR=$SDIR_NAME; fi
+export PRODUCT="GEOM_${SALOME_VERSION}"
+export PRODUCT_SRC="GEOM_SRC_${SALOME_VERSION}"
+export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
+export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT_SRC}