From 136cffe89a734582b8fec13ffcb7d6478209aa10 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Mon, 16 Dec 2013 06:24:48 +0000
Subject: [PATCH] SALOME 7.3.0 preparation

---
 config_files/ATOMGEN.sh         |  4 ++--
 config_files/ATOMIC.sh          |  4 ++--
 config_files/ATOMSOLV.sh        |  4 ++--
 config_files/BLSURFPLUGIN.sh    |  4 ++--
 config_files/CALCULATOR.sh      |  4 ++--
 config_files/COMPONENT.sh       |  4 ++--
 config_files/GEOM.sh            |  4 ++--
 config_files/GHS3DPLUGIN.sh     |  4 ++--
 config_files/GHS3DPRLPLUGIN.sh  |  4 ++--
 config_files/GUI.sh             |  4 ++--
 config_files/HELLO.sh           |  4 ++--
 config_files/HEXABLOCK.sh       |  4 ++--
 config_files/HEXABLOCKPLUGIN.sh |  4 ++--
 config_files/HOMARD.sh          |  4 ++--
 config_files/HexoticPLUGIN.sh   |  4 ++--
 config_files/JOBMANAGER.sh      |  4 ++--
 config_files/LIGHT.sh           |  4 ++--
 config_files/MED.sh             |  4 ++--
 config_files/NETGENPLUGIN.sh    |  4 ++--
 config_files/PARAVIS.sh         |  4 ++--
 config_files/PYCALCULATOR.sh    |  4 ++--
 config_files/PYHELLO.sh         |  4 ++--
 config_files/PYLIGHT.sh         |  4 ++--
 config_files/RANDOMIZER.sh      |  4 ++--
 config_files/SIERPINSKY.sh      |  4 ++--
 config_files/SMESH.sh           |  4 ++--
 config_files/YACS.sh            |  4 ++--
 config_files/common.sh          |  6 ++++++
 config_files/wso2.sh            | 18 ++++++++++++++++++
 29 files changed, 78 insertions(+), 54 deletions(-)

diff --git a/config_files/ATOMGEN.sh b/config_files/ATOMGEN.sh
index ac9cc89..a640585 100755
--- a/config_files/ATOMGEN.sh
+++ b/config_files/ATOMGEN.sh
@@ -116,8 +116,8 @@ check_jb tar xfz ${SRC_DIR}/ATOMGENsourcesV${SALOME_VERSION}.tar.gz -C ${INST_RO
 # modify all *.la files
 export ATOMGEN_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeATOMGENConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeATOMGENTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeATOMGENConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeATOMGENTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/ATOMIC.sh b/config_files/ATOMIC.sh
index 8fbff06..b535254 100755
--- a/config_files/ATOMIC.sh
+++ b/config_files/ATOMIC.sh
@@ -116,8 +116,8 @@ check_jb tar xfz ${SRC_DIR}/ATOMICsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROO
 # modify all *.la files
 export ATOMIC_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeATOMICConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeATOMICTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeATOMICConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeATOMICTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/ATOMSOLV.sh b/config_files/ATOMSOLV.sh
index c518bc4..27fc81d 100755
--- a/config_files/ATOMSOLV.sh
+++ b/config_files/ATOMSOLV.sh
@@ -116,8 +116,8 @@ check_jb tar xfz ${SRC_DIR}/ATOMSOLVsourcesV${SALOME_VERSION}.tar.gz -C ${INST_R
 # modify all *.la files
 export ATOMSOLV_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeATOMSOLVConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeATOMSOLVTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeATOMSOLVConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeATOMSOLVTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/BLSURFPLUGIN.sh b/config_files/BLSURFPLUGIN.sh
index bf5df08..9005ab2 100755
--- a/config_files/BLSURFPLUGIN.sh
+++ b/config_files/BLSURFPLUGIN.sh
@@ -125,8 +125,8 @@ check_jb tar xfz ${SRC_DIR}/BLSURFPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${IN
 # modify all *.la files
 export BLSURFPLUGIN_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeBLSURFPLUGINConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeBLSURFPLUGINTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeBLSURFPLUGINConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeBLSURFPLUGINTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/CALCULATOR.sh b/config_files/CALCULATOR.sh
index 7bf4dc4..224900f 100755
--- a/config_files/CALCULATOR.sh
+++ b/config_files/CALCULATOR.sh
@@ -116,8 +116,8 @@ check_jb tar xfz ${SRC_DIR}/CALCULATORsourcesV${SALOME_VERSION}.tar.gz -C ${INST
 # modify all *.la files
 export CALCULATOR_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeCALCULATORConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeCALCULATORTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeCALCULATORConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeCALCULATORTargets-release.cmake 
 sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export CALCULATOR_ROOT_DIR=.*%export CALCULATOR_ROOT_DIR=${CALCULATOR_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runAppli
 
 # to generate environment scripts
diff --git a/config_files/COMPONENT.sh b/config_files/COMPONENT.sh
index 091be6e..82814ce 100755
--- a/config_files/COMPONENT.sh
+++ b/config_files/COMPONENT.sh
@@ -116,8 +116,8 @@ check_jb tar xfz ${SRC_DIR}/COMPONENTsourcesV${SALOME_VERSION}.tar.gz -C ${INST_
 # modify all *.la files
 export COMPONENT_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeCOMPONENTConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeCOMPONENTTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeCOMPONENTConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeCOMPONENTTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/GEOM.sh b/config_files/GEOM.sh
index b4d8aa4..2619359 100755
--- a/config_files/GEOM.sh
+++ b/config_files/GEOM.sh
@@ -124,8 +124,8 @@ check_jb tar xfz ${SRC_DIR}/GEOMsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 # modify all *.la files
 export GEOM_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeGEOMConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeGEOMTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeGEOMConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeGEOMTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/GHS3DPLUGIN.sh b/config_files/GHS3DPLUGIN.sh
index feee555..65c4dfe 100755
--- a/config_files/GHS3DPLUGIN.sh
+++ b/config_files/GHS3DPLUGIN.sh
@@ -124,8 +124,8 @@ check_jb tar xfz ${SRC_DIR}/GHS3DPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${INS
 # modify all *.la files
 export GHS3DPLUGIN_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeGHS3DPLUGINConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeGHS3DPLUGINTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeGHS3DPLUGINConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeGHS3DPLUGINTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/GHS3DPRLPLUGIN.sh b/config_files/GHS3DPRLPLUGIN.sh
index 82c487e..49b2c5e 100755
--- a/config_files/GHS3DPRLPLUGIN.sh
+++ b/config_files/GHS3DPRLPLUGIN.sh
@@ -123,8 +123,8 @@ check_jb tar xfz ${SRC_DIR}/GHS3DPRLPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${
 # modify all *.la files
 export GHS3DPRLPLUGIN_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeGHS3DPRLPLUGINConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeGHS3DPRLPLUGINTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeGHS3DPRLPLUGINConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeGHS3DPRLPLUGINTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/GUI.sh b/config_files/GUI.sh
index 05fe2e5..56eff0f 100755
--- a/config_files/GUI.sh
+++ b/config_files/GUI.sh
@@ -117,8 +117,8 @@ check_jb tar xfz ${SRC_DIR}/GUIsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 # modify all *.la files
 export GUI_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeGUIConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeGUITargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeGUIConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeGUITargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/HELLO.sh b/config_files/HELLO.sh
index 7fcca65..c5bf7eb 100755
--- a/config_files/HELLO.sh
+++ b/config_files/HELLO.sh
@@ -115,8 +115,8 @@ check_jb tar xfz ${SRC_DIR}/HELLOsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT
 # modify all *.la files
 export HELLO_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHELLOConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHELLOTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHELLOConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHELLOTargets-release.cmake 
 sed -i "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export HELLO_ROOT_DIR=.*%export HELLO_ROOT_DIR=${HELLO_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runAppli
 
 # to generate environment scripts
diff --git a/config_files/HEXABLOCK.sh b/config_files/HEXABLOCK.sh
index c9396a9..4b0ba37 100755
--- a/config_files/HEXABLOCK.sh
+++ b/config_files/HEXABLOCK.sh
@@ -123,8 +123,8 @@ check_jb tar xfz ${SRC_DIR}/HEXABLOCKsourcesV${SALOME_VERSION}.tar.gz -C ${INST_
 # modify all *.la files
 export HEXABLOCK_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHEXABLOCKConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHEXABLOCKTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHEXABLOCKConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHEXABLOCKTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/HEXABLOCKPLUGIN.sh b/config_files/HEXABLOCKPLUGIN.sh
index 17ef33e..d9c99df 100755
--- a/config_files/HEXABLOCKPLUGIN.sh
+++ b/config_files/HEXABLOCKPLUGIN.sh
@@ -124,8 +124,8 @@ check_jb tar xfz ${SRC_DIR}/HEXABLOCKPLUGINsourcesV${SALOME_VERSION}.tar.gz -C $
 # modify all *.la files
 export HEXABLOCKPLUGIN_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHEXABLOCKPLUGINConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHEXABLOCKPLUGINTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHEXABLOCKPLUGINConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHEXABLOCKPLUGINTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/HOMARD.sh b/config_files/HOMARD.sh
index 327b0fe..98b2671 100755
--- a/config_files/HOMARD.sh
+++ b/config_files/HOMARD.sh
@@ -120,8 +120,8 @@ check_jb tar xfz ${SRC_DIR}/HOMARDsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROO
 # modify all *.la files
 export HOMARD_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHOMARDConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHOMARDTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHOMARDConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHOMARDTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/HexoticPLUGIN.sh b/config_files/HexoticPLUGIN.sh
index 08f10eb..e134bdb 100755
--- a/config_files/HexoticPLUGIN.sh
+++ b/config_files/HexoticPLUGIN.sh
@@ -123,8 +123,8 @@ check_jb tar xfz ${SRC_DIR}/HexoticPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${I
 # modify all *.la files
 export HexoticPLUGIN_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHexoticPLUGINConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeHexoticPLUGINTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHexoticPLUGINConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeHexoticPLUGINTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/JOBMANAGER.sh b/config_files/JOBMANAGER.sh
index 37b8433..e1d3b29 100755
--- a/config_files/JOBMANAGER.sh
+++ b/config_files/JOBMANAGER.sh
@@ -110,8 +110,8 @@ check_jb tar xfz ${SRC_DIR}/JOBMANAGERsourcesV${SALOME_VERSION}.tar.gz -C ${INST
 # modify all *.la files
 export JOBMANAGER_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeJOBMANAGERConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeJOBMANAGERTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeJOBMANAGERConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeJOBMANAGERTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/LIGHT.sh b/config_files/LIGHT.sh
index 1974f1b..d81a0dd 100755
--- a/config_files/LIGHT.sh
+++ b/config_files/LIGHT.sh
@@ -113,8 +113,8 @@ check_jb tar xfz ${SRC_DIR}/LIGHTsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT
 # modify all *.la files
 export LIGHT_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeLIGHTConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeLIGHTTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeLIGHTConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeLIGHTTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/MED.sh b/config_files/MED.sh
index 87a0511..47e358b 100755
--- a/config_files/MED.sh
+++ b/config_files/MED.sh
@@ -125,8 +125,8 @@ check_jb tar xfz ${SRC_DIR}/MEDsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 # modify all *.la files
 export MED_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeMEDConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeMEDTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeMEDConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeMEDTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/NETGENPLUGIN.sh b/config_files/NETGENPLUGIN.sh
index 62d1609..9e9832b 100755
--- a/config_files/NETGENPLUGIN.sh
+++ b/config_files/NETGENPLUGIN.sh
@@ -124,8 +124,8 @@ check_jb tar xfz ${SRC_DIR}/NETGENPLUGINsourcesV${SALOME_VERSION}.tar.gz -C ${IN
 # modify all *.la files
 export NETGENPLUGIN_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeNETGENPLUGINConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeNETGENPLUGINTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeNETGENPLUGINConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeNETGENPLUGINTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/PARAVIS.sh b/config_files/PARAVIS.sh
index 01f9dd2..ceabdaf 100755
--- a/config_files/PARAVIS.sh
+++ b/config_files/PARAVIS.sh
@@ -118,8 +118,8 @@ check_jb tar xfz ${SRC_DIR}/PARAVISsourcesV${SALOME_VERSION}.tar.gz -C ${INST_RO
 # modify all *.la files
 export PARAVIS_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomePARAVISConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomePARAVISTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomePARAVISConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomePARAVISTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/PYCALCULATOR.sh b/config_files/PYCALCULATOR.sh
index 18a1151..9fa6618 100755
--- a/config_files/PYCALCULATOR.sh
+++ b/config_files/PYCALCULATOR.sh
@@ -116,8 +116,8 @@ check_jb tar xfz ${SRC_DIR}/PYCALCULATORsourcesV${SALOME_VERSION}.tar.gz -C ${IN
 # modify all *.la files
 export PYCALCULATOR_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomePYCALCULATORConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomePYCALCULATORTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomePYCALCULATORConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomePYCALCULATORTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/PYHELLO.sh b/config_files/PYHELLO.sh
index e05d10b..97d4d59 100755
--- a/config_files/PYHELLO.sh
+++ b/config_files/PYHELLO.sh
@@ -114,8 +114,8 @@ check_jb tar xfz ${SRC_DIR}/PYHELLOsourcesV${SALOME_VERSION}.tar.gz -C ${INST_RO
 # modify all *.la files
 export PYHELLO_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomePYHELLOConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomePYHELLOTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomePYHELLOConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomePYHELLOTargets-release.cmake 
 sed -e "s%export KERNEL_ROOT_DIR=.*%export KERNEL_ROOT_DIR=${KERNEL_ROOT_DIR}%g;s%export PYHELLO_ROOT_DIR=.*%export PYHELLO_ROOT_DIR=${PYHELLO_ROOT_DIR}%g" ${PRODUCT_DIR}/bin/salome/runAppli
 
 # to generate environment scripts
diff --git a/config_files/PYLIGHT.sh b/config_files/PYLIGHT.sh
index 727892b..79b72d7 100755
--- a/config_files/PYLIGHT.sh
+++ b/config_files/PYLIGHT.sh
@@ -114,8 +114,8 @@ check_jb tar xfz ${SRC_DIR}/PYLIGHTsourcesV${SALOME_VERSION}.tar.gz -C ${INST_RO
 # modify all *.la files
 export PYLIGHT_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomePYLIGHTConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomePYLIGHTTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomePYLIGHTConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomePYLIGHTTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/RANDOMIZER.sh b/config_files/RANDOMIZER.sh
index 4997fef..c0b1a5c 100755
--- a/config_files/RANDOMIZER.sh
+++ b/config_files/RANDOMIZER.sh
@@ -115,8 +115,8 @@ check_jb tar xfz ${SRC_DIR}/RANDOMIZERsourcesV${SALOME_VERSION}.tar.gz -C ${INST
 # modify all *.la files
 export RANDOMIZER_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeRANDOMIZERConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeRANDOMIZERTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeRANDOMIZERConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeRANDOMIZERTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/SIERPINSKY.sh b/config_files/SIERPINSKY.sh
index beace25..ed367b0 100755
--- a/config_files/SIERPINSKY.sh
+++ b/config_files/SIERPINSKY.sh
@@ -115,8 +115,8 @@ check_jb tar xfz ${SRC_DIR}/SIERPINSKYsourcesV${SALOME_VERSION}.tar.gz -C ${INST
 # modify all *.la files
 export SIERPINSKY_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeSIERPINSKYConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeSIERPINSKYTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeSIERPINSKYConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeSIERPINSKYTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/SMESH.sh b/config_files/SMESH.sh
index b7259cf..7a701b9 100755
--- a/config_files/SMESH.sh
+++ b/config_files/SMESH.sh
@@ -124,8 +124,8 @@ check_jb tar xfz ${SRC_DIR}/SMESHsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT
 # modify all *.la files
 export SMESH_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeSMESHConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeSMESHTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeSMESHConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeSMESHTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/YACS.sh b/config_files/YACS.sh
index 0418b40..76515cd 100755
--- a/config_files/YACS.sh
+++ b/config_files/YACS.sh
@@ -123,8 +123,8 @@ check_jb tar xfz ${SRC_DIR}/YACSsourcesV${SALOME_VERSION}.tar.gz -C ${INST_ROOT}
 # modify all *.la files
 export YACS_ROOT_DIR=${PRODUCT_DIR}
 test -z ${SINGLE_DIR} && modif_la_files ${PRODUCT_DIR}
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeYACSConfig.cmake
-modif_cfg_file ${PRODUCT_DIR}/salome_adm/cmake_files/SalomeYACSTargets-release.cmake 
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeYACSConfig.cmake
+modif_cfg_file ${PRODUCT_DIR}/adm_local/cmake_files/SalomeYACSTargets-release.cmake 
 
 # to generate environment scripts
 try_preinstalled
diff --git a/config_files/common.sh b/config_files/common.sh
index c161521..d9b2cd0 100755
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -995,6 +995,9 @@ modif_cfg_file(){
     if [ "${QT4_ROOT_DIR}" != "" ] ; then
 	sed -i "s%\([^/]*\)[^;]*/qt-[0-9.]\+%\1${QT4_ROOT_DIR}%g" $1
     fi
+    if [ "${QWT_ROOT_DIR}" != "" ] ; then
+	sed -i "s%\([^/]*\)[^;]*/qwt-[0-9.]\+%\1${QWT_ROOT_DIR}%g" $1
+    fi
     if [ "${SIP_ROOT_DIR}" != "" ] ; then
 	sed -i "s%\([^/]*\)[^;]*/sip-[0-9.]\+%\1${SIP_ROOT_DIR}%g" $1
     fi
@@ -1031,6 +1034,9 @@ modif_cfg_file(){
     if [ "${NETGEN_ROOT_DIR}" != "" ] ; then
 	sed -i "s%\([^/]*\)[^;]*/netgen-[0-9.]\+%\1${NETGEN_ROOT_DIR}%g" $1
     fi
+    if [ "${CGNS_ROOT_DIR}" != "" ] ; then
+	sed -i "s%\([^/]*\)[^;]*/cgnslib-[0-9.]\+%\1${CGNS_ROOT_DIR}%g" $1
+    fi
     if [ "${NUMPY_ROOT_DIR}" != "" ] ; then
 	sed -i "s%\([^/]*\)[^;]*/numpy-[0-9.]\+%\1${NUMPY_ROOT_DIR}%g" $1
     fi
diff --git a/config_files/wso2.sh b/config_files/wso2.sh
index 438510e..446f46d 100755
--- a/config_files/wso2.sh
+++ b/config_files/wso2.sh
@@ -116,6 +116,24 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
+# modifing la files
+for f in `find ${PRODUCT_DIR} -name "*.la"` X ; do
+    case ${f} in
+	X ) ;;
+	* ) sed -i "s%^libdir='.*/wso2-wsf-cpp-[0-9.]\+%libdir='${PRODUCT_DIR}%g;s%[[:space:]][^[:space:]]\+/wso2-wsf-cpp-[0-9.]\+/% ${PRODUCT_DIR}/%g" ${f} ;;
+    esac
+done
+# modify pkgconfig
+if [ -d ${PRODUCT_DIR}/lib/pkgconfig ] ; then
+  for f in X `find ${PRODUCT_DIR}/lib/pkgconfig -name "*.pc"`; do
+    case ${f} in
+	X ) ;;
+	* ) sed -i "s%^prefix=.*%prefix=${PRODUCT_DIR}%g" ${f}
+    esac
+  done
+fi
+
+
 # to generate environment script for sources
 try_preinstalled
 }
-- 
2.30.2