small bug in environment update

diff --git a/scripts/SA_build b/scripts/SA_build
index b63d776d56752ce2f8d5b25553d420efdc4f1543..f4238faf5463d949b3203028b7e4bdb848214196 100755 (executable)
--- a/scripts/SA_build
+++ b/scripts/SA_build
@@ -259,11 +259,9 @@ update_environ()
        else
           echo -e "##\n#------ ${SOURCE_NAME}-Src ------\nexport $3=$4" >> ${ENVIRON_FILE}
           echo -e "##\n#------ ${SOURCE_NAME}-Bin ------\nexport $1=$2" >> ${ENVIRON_FILE}
-          if [ -d $2/lib/salome ]
+          if [ -d $2/lib ] && [ ! -d $2/lib/salome ]
           then
               # for salome modules, do nothing
-              #echo -e "export PYTHONPATH=\${${1}}/bin/salome:\${${1}}/lib/salome:\${${1}}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}" >> ${ENVIRON_FILE}
-          else
               echo -e "export PYTHONPATH=\${${1}}/bin:\${${1}}/lib:\${PYTHONPATH}" >> ${ENVIRON_FILE}
           fi
        fi
@@ -279,10 +277,8 @@ update_environ()
        else
           echo -e "##\n#------ ${SOURCE_NAME}-Src ------\nsetenv $3 $4" >> ${ENVIRON_FILE}
           echo -e "##\n#------ ${SOURCE_NAME}-Bin ------\nsetenv $1 $2" >> ${ENVIRON_FILE}
-          if [ -d $2/lib/salome ]
+          if [ -d $2/lib ] && [ ! -d $2/lib/salome ]
           then
-              #echo -e "setenv PYTHONPATH \${${1}}/bin/salome:\${${1}}/lib/salome:\${${1}}/lib/python\${PYTHON_VERSION}/site-packages/salome:\${PYTHONPATH}" >> ${ENVIRON_FILE}
-          else
               echo -e "setenv PYTHONPATH \${${1}}/bin:\${${1}}/lib:\${PYTHONPATH}" >> ${ENVIRON_FILE}
           fi