Updated to compile on archlinux current

3 files changed, 32 insertions, 14 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e9a207dae14e..054c2cc56fce 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Fri Jun  3 17:29:04 UTC 2016
 pkgbase = salome-eficas
 	pkgdesc = Generic platform for Pre and Post-Processing for numerical simulation - EFICAS Module
 	pkgver = 2015.2
-	pkgrel = 1
+	pkgrel = 2
 	url = http://www.code-aster.org/V2/spip.php?article295
 	arch = i686
 	arch = x86_64
@@ -12,7 +14,7 @@ pkgbase = salome-eficas
 	source = http://www.code-aster.org/FICHIERS/SALOME-MECA-2015.2-LGPL-2.tgz
 	source = salome-eficas.profile
 	md5sums = a78eae0b1937f06ced8e7f570b05f94b
-	md5sums = d45d5c60252a726244d7e596b828daff
+	md5sums = 516dc814f533467243ebe26ba056c163
 
 pkgname = salome-eficas
 
diff --git a/PKGBUILD b/PKGBUILD
index 504b902bb00a..ae3cf2cacd39 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 
 pkgname=salome-eficas
 pkgver=2015.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Generic platform for Pre and Post-Processing for numerical simulation - EFICAS Module"
 url="http://www.code-aster.org/V2/spip.php?article295"
 depends=('salome-gui>=7.6.0' 'salome-gui<7.7.0' 'eficas>=2015.2')
@@ -13,7 +13,9 @@ license=('LGPL')
 _pkgsubver=2
 source=("http://www.code-aster.org/FICHIERS/SALOME-MECA-${pkgver}-LGPL-${_pkgsubver}.tgz" "${pkgname}.profile")
 
-_installdir=/opt/salome/eficas
+_basedir=/opt/salome
+_installdir=${_basedir}
+_profiledir=${_basedir}/env.d
 
 prepare() {
   cd "$srcdir"
@@ -30,11 +32,14 @@ build() {
 package() {
   cd "${srcdir}/V2015_2/modules/EFICAS_V7_6_0"
   install -d -m755 "${pkgdir}${_installdir}"
-  cp -rp * "${pkgdir}${_installdir}/"
-  
+  cp -rp * "${pkgdir}${_installdir}"
+
+  rm -f "${pkgdir}${_installdir}/bin/salome/VERSION"
+  rm -f "${pkgdir}${_installdir}/include/salome/SALOMEconfig.h"
+
   install -D -m755 "${srcdir}/${pkgname}.profile" \
-                   "${pkgdir}/etc/salome/profile.d/${pkgname}.sh"
+                   "${pkgdir}${_profiledir}/${pkgname}.sh"
 
 }
 md5sums=('a78eae0b1937f06ced8e7f570b05f94b'
-         'd45d5c60252a726244d7e596b828daff')
+         '516dc814f533467243ebe26ba056c163')
diff --git a/salome-eficas.profile b/salome-eficas.profile
index bcd349640fc7..7a7277130e74 100644
--- a/salome-eficas.profile
+++ b/salome-eficas.profile
@@ -1,9 +1,20 @@
+export EFICAS_ROOT_DIR=/opt/salome
 export EFICAS_ROOT=/opt/eficas/public/eficas-2015.2/
-export EFICAS_ROOT_DIR=/opt/salome/eficas
 
-export PYTHONPATH=$EFICAS_ROOT_DIR/lib/python2.7/site-packages/salome:$PYTHONPATH
-export PYTHONPATH=$EFICAS_ROOT:$PYTHONPATH
-export PYTHONPATH=$EFICAS_ROOT/UiQT4:$PYTHONPATH
-export PYTHONPATH=$EFICAS_ROOT/Editeur:$PYTHONPATH
+_pythonver=2.7
+_eficas_path=$EFICAS_ROOT_DIR/bin/salome
+_eficas_pythonpath=$EFICAS_ROOT_DIR/lib/python${_pythonver}/site-packages/salome
+_eficas_util_pythonpath=$EFICAS_ROOT:$EFICAS_ROOT/UiQT4:$EFICAS_ROOT/Editeur
 
-export PATH=$EFICAS_ROOT_DIR/bin/salome:$PATH
+# PYTHONPATH
+if [[ $PYTHONPATH != *${_eficas_pythonpath}* ]]; then
+  export PYTHONPATH=${_eficas_pythonpath}:$PYTHONPATH
+fi
+if [[ $PYTHONPATH != *${_eficas_util_pythonpath}* ]]; then
+  export PYTHONPATH=${_eficas_util_pythonpath}:$PYTHONPATH
+fi
+
+# PATH
+if [[ $PATH != *${_eficas_path}* ]]; then
+  export PATH=${_eficas_path}:$PATH
+fi