From: crouzet <crouzet>
Date: Tue, 2 Oct 2007 13:56:42 +0000 (+0000)
Subject: small bug in environment update
X-Git-Tag: V4_1_0~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=28b87dcdfc3319db7d54eee837d951e152c41f1e;p=tools%2Fhxx2salome.git

small bug in environment update
---

diff --git a/scripts/SA_build b/scripts/SA_build
index b63d776..f4238fa 100755
--- 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