From 5d69d9d558348b150484dd078a40fadcf95a879c Mon Sep 17 00:00:00 2001
From: asv <asv@opencascade.com>
Date: Tue, 27 Jun 2006 07:48:56 +0000
Subject: [PATCH] Fix to bug PAL10465. Modification of resource files location
 in "build" and "installation" directories.  Now resource files are placed in
 share/salome/resources/<module_name>.  Various configuration files
 (configure.in.base, make_module/conclude/commence, etc.) are changed.

---
 adm_local/unix/make_commence.in | 2 ++
 configure.in.base               | 6 +++++-
 resources/SalomeApp.xml         | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 3e8f8b8..1b07605 100644
--- a/adm_local/unix/make_commence.in
+++ b/adm_local/unix/make_commence.in
@@ -1,6 +1,8 @@
 # common directories to put headerfiles
 inc_builddir=$(top_builddir)/include/salome
 
+MODULE_NAME=@MODULE_NAME@
+
 @SET_MAKE@
 SHELL=/bin/sh
 
diff --git a/configure.in.base b/configure.in.base
index 056ea39..dac3060 100644
--- a/configure.in.base
+++ b/configure.in.base
@@ -27,6 +27,10 @@ XVERSION=0x030200
 AC_SUBST(VERSION)
 AC_SUBST(XVERSION)
 
+# set up MODULE_NAME variable for dynamic construction of directories (resources, etc.)
+MODULE_NAME=superv
+AC_SUBST(MODULE_NAME)
+
 dnl
 dnl Initialize source and build root directories
 dnl
@@ -329,7 +333,7 @@ else
 fi
 
 # make other build directories
-for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources idl
+for rep in salome_adm adm_local doc bin/salome include/salome lib${LIB_LOCATION_SUFFIX}/salome share/salome/resources/${MODULE_NAME} idl
 do
 #   if test ! -d $rep ; then
 #      eval mkdir $rep
diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 4848fae..70797d4 100644
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -6,6 +6,6 @@
   </section>
   <section name="resources">
     <!-- Module resources -->
-    <parameter name="SUPERV" value="${SUPERV_ROOT_DIR}/share/salome/resources"/>
+    <parameter name="SUPERV" value="${SUPERV_ROOT_DIR}/share/salome/resources/superv"/>
   </section>
 </document>
-- 
2.39.2