From: Pascale Noyret <pascale.noyret@edf.fr>
Date: Fri, 17 Nov 2006 14:35:06 +0000 (+0000)
Subject: PN: on verra celui de la branche maintenance
X-Git-Tag: V3_2_3_pre1~6
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4bcb77c5491002a5795d6f1d020a636b0efb68ba;p=modules%2Feficas.git

PN: on verra celui de la branche maintenance
---

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 2f93421b..8762806a 100644
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -7,6 +7,6 @@
   </section>
   <section name="resources">
     <!-- Module resources -->
-    <parameter name="EFICAS" value="${EFICAS_ROOT_DIR}/share/salome/resources"/>
+    <parameter name="EFICAS" value="${EFICAS_ROOT_DIR}/share/salome/resources/eficas"/>
   </section>
 </document>
diff --git a/src/EFICASGUI/Makefile.in b/src/EFICASGUI/Makefile.in
index 079fe3c2..73c0c469 100644
--- a/src/EFICASGUI/Makefile.in
+++ b/src/EFICASGUI/Makefile.in
@@ -32,6 +32,7 @@ LIB_SERVER_IDL =
 PO_FILES =  EFICAS_msg_en.po EFICAS_icons.po
 
 EXPORT_PYSCRIPTS = \
+SelectMainShapeDiag_ui.py\
 EFICASGUI.py   \
 eficasSalome.py \
 
@@ -39,6 +40,10 @@ eficasSalome.py \
 # _CS_gbo_151104 Ajout pour compatibilité ascendante entre versions de Eficas
 EXPORT_PYSCRIPTS+=eficas_etude.py
 
+# On utilise le pyuic trouvé par le configure plutôt que celui se trouvant dans l'environnement
+PYUIC = pyuic
+%.py:%.ui
+	$(PYUIC) $< -o $@
 
 
 @CONCLUDE@