PN: on verra celui de la branche maintenance

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 2f93421be8c5e72c8f13359b6ea560953f0f22e4..8762806aecb2dc1e711ddc91ca84484c3f8a3f25 100644 (file)
--- 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 079fe3c2e01e72d52ad10f406a43fd6137366ef8..73c0c469c51419f5865bc8fee3f55483195eab59 100644 (file)
--- 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@