From: André Ribes <aribes@cli75al.der.edf.fr>
Date: Tue, 18 May 2010 15:13:55 +0000 (+0200)
Subject: Meilleur portabilité
X-Git-Tag: V6_4_0rc3~149
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=fe50717dc4c6390b7258c048439356040fad2495;p=modules%2Fadao.git

Meilleur portabilité
---

diff --git a/configure.ac b/configure.ac
index ac4803c..f46db61 100644
--- a/configure.ac
+++ b/configure.ac
@@ -68,6 +68,7 @@ AC_CONFIG_FILES([
         src/Makefile
         src/daComposant/Makefile
         src/daEficas/Makefile
+        src/daEficas/prefs_DATASSIM.py
         src/daSalome/Makefile
         src/daSalome/daGUI/Makefile
         src/daSalome/daGUI/daGuiImpl/Makefile
diff --git a/src/daEficas/Makefile.am b/src/daEficas/Makefile.am
index 1ae2f05..bb1f4f5 100644
--- a/src/daEficas/Makefile.am
+++ b/src/daEficas/Makefile.am
@@ -29,3 +29,5 @@ mypkgpython_PYTHON = \
 		     __init__.py \
 		     prefs_DATASSIM.py \
 		     prefs.py
+
+EXTRA_DIST = prefs_DATASSIM.py.in
diff --git a/src/daEficas/prefs_DATASSIM.py b/src/daEficas/prefs_DATASSIM.py
deleted file mode 100644
index 6386308..0000000
--- a/src/daEficas/prefs_DATASSIM.py
+++ /dev/null
@@ -1,37 +0,0 @@
-# -*- coding: utf-8 -*-
-import os, sys
-
-print "import des prefs de Datassim"
-
-# Configuration de Eficas
-# INSTALLDIR, REPINI est obligatoire
-INSTALLDIR = "/home/aribes/Dev/Src/CVS_SALOME/EficasV1"
-sys.path[:0]=[INSTALLDIR]
-# positionnee a repin au debut mise a jour dans configuration
-REPINI=os.path.dirname(os.path.abspath(__file__))
-
-# initialdir sert comme directory initial des QFileDialog
-initialdir=os.environ["PWD"]
-# Codage des strings qui accepte les accents (en remplacement de 'ascii')
-encoding='iso-8859-1'
-# lang indique la langue utilisée pour les chaines d'aide : fr ou ang
-lang='fr'
-
-
-# INSTALLDIR sert � localiser l'installation d'Eficas
-#INSTALLDIR=os.path.join(REPINI,'..')
-
-
-
-# Acces a la documentation
-#rep_cata        = INSTALLDIR
-#path_doc        = os.path.join(rep_cata,'Doc')
-#exec_acrobat    = "/usr/bin/xpdf"
-#savedir         = os.environ['HOME']
-
-
-# OpenTURNS Python module
-#OpenTURNS_path="/local00/home/dutka/OpenTURNS/trunk-cmake/build-autotools/install/lib/python2.4/site-packages"
-# Choix des catalogues
-#sys.path[:0]=[INSTALLDIR, OpenTURNS_path]
-
diff --git a/src/daEficas/prefs_DATASSIM.py.in b/src/daEficas/prefs_DATASSIM.py.in
new file mode 100644
index 0000000..801e5fa
--- /dev/null
+++ b/src/daEficas/prefs_DATASSIM.py.in
@@ -0,0 +1,37 @@
+# -*- coding: utf-8 -*-
+import os, sys
+
+print "import des prefs de Datassim"
+
+# Configuration de Eficas
+# INSTALLDIR, REPINI est obligatoire
+INSTALLDIR = "@EFICAS_DIR@"
+sys.path[:0]=[INSTALLDIR]
+# positionnee a repin au debut mise a jour dans configuration
+REPINI=os.path.dirname(os.path.abspath(__file__))
+
+# initialdir sert comme directory initial des QFileDialog
+initialdir=os.environ["PWD"]
+# Codage des strings qui accepte les accents (en remplacement de 'ascii')
+encoding='iso-8859-1'
+# lang indique la langue utilisée pour les chaines d'aide : fr ou ang
+lang='fr'
+
+
+# INSTALLDIR sert � localiser l'installation d'Eficas
+#INSTALLDIR=os.path.join(REPINI,'..')
+
+
+
+# Acces a la documentation
+#rep_cata        = INSTALLDIR
+#path_doc        = os.path.join(rep_cata,'Doc')
+#exec_acrobat    = "/usr/bin/xpdf"
+#savedir         = os.environ['HOME']
+
+
+# OpenTURNS Python module
+#OpenTURNS_path="/local00/home/dutka/OpenTURNS/trunk-cmake/build-autotools/install/lib/python2.4/site-packages"
+# Choix des catalogues
+#sys.path[:0]=[INSTALLDIR, OpenTURNS_path]
+