*** empty log message ***

[tools/install.git] / config_files / YACS.sh

diff --git a/config_files/YACS.sh b/config_files/YACS.sh
index cdbb57e5bc4dd24ae5928a0e2619149707f3ae0a..a8cb5a6f66374798080c524695f6d31e579cecc9 100755 (executable)
--- a/config_files/YACS.sh
+++ b/config_files/YACS.sh
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-VERSION="4.1.0"
+VERSION="4.1.1"
 
 check_version(){
 if [ -n "${YACS_ROOT_DIR}" ]; then
@@ -38,9 +38,7 @@ export LIB_PREFIX=""
 fi
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
-export YACS_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export YACSGui_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
-export YACSGUI_ROOT_DIR=\${INSTALL_ROOT}/${PRODUCT}
+export YACS_ROOT_DIR=\${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 if [ -n "\${ENV_FOR_LAUNCH}" ] ; then
   if [ "\${ENV_FOR_LAUNCH}" == "1" ] ; then
     export PATH=\${YACS_ROOT_DIR}/bin/salome:\${PATH}
@@ -87,7 +85,7 @@ install_source_and_build()
 install_source
 
 # build sources
-mkdir -p ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
 if [ -e ./build.sh ] ; then
     cp -f ./build.sh ${INSTALL_ROOT}
@@ -114,12 +112,15 @@ install_binary()
 make_env ${INSTALL_ROOT} ${INSTALL_WORK} "${PRODUCT_SEQUENCE}" "${INSTALL_PRODUCTS}" ${PRODUCT_TYPE}
 source ${INSTALL_WORK}/$SHRC
 
-check_jb tar xfz ${SOURCE_DIR}/YACSbinariesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
+# create a module directory
+test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
+
+check_jb tar xfz ${SOURCE_DIR}/YACSbinariesV${VERSION}.tar.gz -C ${PRODUCT_DIR}
 check_jb tar xfz ${SRC_DIR}/YACSsourcesV${VERSION}.tar.gz -C ${INSTALL_ROOT}
 
 # modify all *.la files
 export YACS_ROOT_DIR=${PRODUCT_DIR}
-modif_la_files ${PRODUCT_DIR}
+test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
 
 # to generate environment scripts
 try_preinstalled
@@ -135,9 +136,11 @@ export INSTALL_PRODUCTS=$7;
 SRC_DIR=$8;
 shift
 REMOVE_SRC_TMP=$8;
+shift
+SINGLE_DIR=$9;
 export PRODUCT="YACS_${VERSION}"
 export PRODUCT_SRC="YACS_SRC_${VERSION}"
-export PRODUCT_DIR=${INSTALL_ROOT}/${PRODUCT}
+export PRODUCT_DIR=${INSTALL_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_SRC_DIR=${INSTALL_ROOT}/${PRODUCT_SRC}
 source ./common.sh
 $PROCEDURE