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.

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 79373ac5cb364e882b6b5acb9d08e532b79dd4fb..2e1023943741d9bb5b7d6cbe54072f07d49b971c 100644 (file)
--- 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 4ffaf295cfdece312b1a2e8bc7873e8d000ff97b..64ae467d26a99c2223b38c48e4af3c798298dfe9 100644 (file)
--- 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=ghs3dplugin
+AC_SUBST(MODULE_NAME)
+
 dnl
 dnl Initialize source and build root directories
 dnl
@@ -357,7 +361,7 @@ 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
+       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