Simplifying python files installation scheme

diff --git a/bin/Makefile.am b/bin/Makefile.am
index 7e8d62e8007d971b7cdee566dbac0c3ff9c1e452..5c9e60bfca91e240f69a6ecb4e3509c78f37a2a8 100644 (file)
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -26,8 +26,10 @@ bin_SCRIPTS = AdaoYacsSchemaCreator.py qtEficas_adao_study.py # AdaoCatalogGener
 
 EXTRA_DIST = AdaoYacsSchemaCreator.py qtEficas_adao_study.py.in # AdaoCatalogGenerator.py module_version.py
 
+ADAODIR = $(DESTDIR)$(salomepythondir)/adao
+
 install-data-hook:
-       @export PYTHONPATH=$(DESTDIR)${salomepythondir}:${PYTHONPATH} && python $(top_srcdir)/bin/AdaoCatalogGenerator.py $(DESTDIR)${salomepythondir}/daEficas ADAO_Cata_V0.py
+       @export PYTHONPATH=$(DESTDIR)${salomepythondir}:${PYTHONPATH} && python $(top_srcdir)/bin/AdaoCatalogGenerator.py $(ADAODIR)/daEficas ADAO_Cata_V0.py
 
 uninstall-hook:
-       @rm  $(DESTDIR)${salomepythondir}/daEficas/ADAO_Cata_V0.py
+       @rm  $(ADAODIR)/daEficas/ADAO_Cata_V0.py

diff --git a/bin/qtEficas_adao_study.py.in b/bin/qtEficas_adao_study.py.in
index 0f527d2681614373059b6e85b2b1498e1d8da2de..da5dfab1622d950d8de0b2d43925dbd1369cc0c9 100644 (file)
--- a/bin/qtEficas_adao_study.py.in
+++ b/bin/qtEficas_adao_study.py.in
@@ -30,7 +30,7 @@ import sys
 # Configuration de l'installation
 INSTALLDIR = "@EFICAS_DIR@"
 sys.path.insert(0,INSTALLDIR)
-ADAO_INSTALL_DIR = "@PYTHON_SITE@/salome/daEficas"
+ADAO_INSTALL_DIR = "@PYTHON_SITE@/salome/adao/daEficas"
 sys.path.insert(0,ADAO_INSTALL_DIR)
 
 # Configuration

diff --git a/src/daComposant/Makefile.am b/src/daComposant/Makefile.am
index 3f3135c63236ae2eb6cc3fdfa3aefed85ae4687b..65552d2e85f12ac892bc4d7fe1e0d76e0bd6b3dc 100644 (file)
--- a/src/daComposant/Makefile.am
+++ b/src/daComposant/Makefile.am
@@ -26,14 +26,16 @@ EXTRA_DIST = daCore daAlgorithms daNumerics
 
 DIR = $(top_srcdir)/src/daComposant/
 
+ADAODIR = $(DESTDIR)$(salomepythondir)/adao
+
 install-data-local:
-       ${mkinstalldirs} $(DESTDIR)$(salomepythondir)
-       cp -R $(DIR)daCore $(DESTDIR)$(salomepythondir)
-       cp -R $(DIR)daAlgorithms $(DESTDIR)$(salomepythondir)
-       cp -R $(DIR)daNumerics $(DESTDIR)$(salomepythondir)
+       ${mkinstalldirs} $(ADAODIR)
+       cp -R $(DIR)daCore $(ADAODIR)
+       cp -R $(DIR)daAlgorithms $(ADAODIR)
+       cp -R $(DIR)daNumerics $(ADAODIR)
 
 uninstall-local:
-       chmod -R +w $(DESTDIR)$(salomepythondir)
-       rm -rf $(DESTDIR)$(salomepythondir)/daCore
-       rm -rf $(DESTDIR)$(salomepythondir)/daAlgorithms
-       rm -rf $(DESTDIR)$(salomepythondir)/daNumerics
+       chmod -R +w $(ADAODIR)
+       rm -rf $(ADAODIR)/daCore
+       rm -rf $(ADAODIR)/daAlgorithms
+       rm -rf $(ADAODIR)/daNumerics

diff --git a/src/daEficas/Makefile.am b/src/daEficas/Makefile.am
index 06282d1df5592208bf9b708eba96f10e7b34b50a..36c6c43d7f0f3488942729e80ced24f06d3b3032 100644 (file)
--- a/src/daEficas/Makefile.am
+++ b/src/daEficas/Makefile.am
@@ -23,7 +23,9 @@
 
 include $(top_srcdir)/adm_local/make_common_starter.am
 
-mypkgpythondir =$(salomepythondir)/daEficas
+ADAODIR = $(DESTDIR)$(salomepythondir)/adao
+
+mypkgpythondir = $(ADAODIR)/daEficas
 
 mypkgpython_PYTHON = \
                configuration_ADAO.py \

diff --git a/src/daSalome/Makefile.am b/src/daSalome/Makefile.am
index cdf1e45fea55f8632e4af2293158046d9483524f..4659d896032ce9a6eb02684c32417285d84a7906 100644 (file)
--- a/src/daSalome/Makefile.am
+++ b/src/daSalome/Makefile.am
@@ -22,7 +22,7 @@
 
 include $(top_srcdir)/adm_local/make_common_starter.am
 
-salomepython_PYTHON= adaoBuilder.py
+# salomepython_PYTHON= adaoBuilder.py
 
 SUBDIRS= daGUI
 
@@ -30,14 +30,16 @@ EXTRA_DIST = daYacsSchemaCreator daYacsIntegration
 
 DIR = $(top_srcdir)/src/daSalome/
 
+ADAODIR = $(DESTDIR)$(salomepythondir)/adao
+
 install-data-local:
-       ${mkinstalldirs} $(DESTDIR)$(salomepythondir)
-       cp -R $(DIR)daYacsSchemaCreator $(DESTDIR)$(salomepythondir)
-       cp -R $(DIR)daYacsIntegration $(DESTDIR)$(salomepythondir)
-       cp    $(DIR)adaoBuilder.py $(DESTDIR)$(salomepythondir)
+       ${mkinstalldirs} $(ADAODIR)
+       cp -R $(DIR)daYacsSchemaCreator $(ADAODIR)
+       cp -R $(DIR)daYacsIntegration $(ADAODIR)
+       cp    $(DIR)adaoBuilder.py $(ADAODIR)
 
 uninstall-local:
-       chmod -R +w $(DESTDIR)$(salomepythondir)
-       rm -rf $(DESTDIR)$(salomepythondir)/daYacsSchemaCreator
-       rm -rf $(DESTDIR)$(salomepythondir)/daYacsIntegration
-       rm     $(DESTDIR)$(salomepythondir)/adaoBuilder.py
+       chmod -R +w $(ADAODIR)
+       rm -rf $(ADAODIR)/daYacsSchemaCreator
+       rm -rf $(ADAODIR)/daYacsIntegration
+       rm  -f $(ADAODIR)/adaoBuilder.py

diff --git a/src/daSalome/daGUI/daEficasWrapper/Makefile.am b/src/daSalome/daGUI/daEficasWrapper/Makefile.am
index 4145dc1659c08d3f197779b9aead86fec6f085af..26ee736ea22eec79621fc9d1e9b5a2994eac5936 100644 (file)
--- a/src/daSalome/daGUI/daEficasWrapper/Makefile.am
+++ b/src/daSalome/daGUI/daEficasWrapper/Makefile.am
@@ -21,7 +21,9 @@
 
 include $(top_srcdir)/adm_local/make_common_starter.am
 
-mypkgpythondir =$(salomepythondir)/daEficasWrapper
+ADAODIR = $(DESTDIR)$(salomepythondir)/adao
+
+mypkgpythondir = $(ADAODIR)/daEficasWrapper
 
 mypkgpython_PYTHON = \
                     __init__.py \

diff --git a/src/daSalome/daGUI/daGuiImpl/Makefile.am b/src/daSalome/daGUI/daGuiImpl/Makefile.am
index 51d13fdc6a8d8b8ceb66e05afbfaade2ee84b150..9e72ec91c32c8135e8d2303c78180959879c981a 100644 (file)
--- a/src/daSalome/daGUI/daGuiImpl/Makefile.am
+++ b/src/daSalome/daGUI/daGuiImpl/Makefile.am
@@ -21,7 +21,9 @@
 
 include $(top_srcdir)/adm_local/make_common_starter.am
 
-mypkgpythondir =$(salomepythondir)/daGuiImpl
+ADAODIR = $(DESTDIR)$(salomepythondir)/adao
+
+mypkgpythondir = $(ADAODIR)/daGuiImpl
 
 mypkgpython_PYTHON = \
                     __init__.py \

diff --git a/src/daSalome/daGUI/daUtils/Makefile.am b/src/daSalome/daGUI/daUtils/Makefile.am
index 4f5e33121a3ccc9fd5618f4ada344b5c382523ba..7910a03928460fce874c57841399e37ce272d9ae 100644 (file)
--- a/src/daSalome/daGUI/daUtils/Makefile.am
+++ b/src/daSalome/daGUI/daUtils/Makefile.am
@@ -21,7 +21,9 @@
 
 include $(top_srcdir)/adm_local/make_common_starter.am
 
-mypkgpythondir =$(salomepythondir)/daUtils
+ADAODIR = $(DESTDIR)$(salomepythondir)/adao
+
+mypkgpythondir = $(ADAODIR)/daUtils
 
 mypkgpython_PYTHON = \
                     __init__.py \