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/Makefile.in b/Makefile.in
index d1dbea2bd8ecb5d3492d5fee97444c74b8b90a2e..6c30a8f7ee4932b1ec2b61f5aff866b1afc135b3 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -81,18 +81,6 @@ depend_idl:
 #doc:
 #      (cd doc && $(MAKE) $@) || exit 1
 
-install-end:
-# finish libtool install
-#      @$(LT) --mode=finish $(libdir)
-
-install-include: $(include_list)
-       $(INSTALL) -d  $(includedir)
-       @for f in X $(include_list); do                         \
-          if test $$f != X; then                               \
-            ($(INSTALL_DATA) $$f $(includedir)/. || exit 1);   \
-          fi;                                                  \
-       done
-
 # install script in $(bindir) :
 install-bin: $(BIN_SCRIPT)
        $(INSTALL) -d  $(bindir)
@@ -113,5 +101,4 @@ distclean-other:
 
 @MODULE@
 
-install: install-bin install-include install-end
-
+install: install-bin
\ No newline at end of file

diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in
index 5ad69cc0ddb56e419e7f1f6593d55c4371c634cd..213314d0887d4b0df28778ea8e00af3980a3d23a 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 b3ee35cac2e576d2f2b1d16d3e807fa1cbd98a59..f1f7f53e5308acaa96b9cb720ca09a67ee18b160 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=pyhello
+AC_SUBST(MODULE_NAME)
+
 dnl
 dnl Initialize source and build root directories
 dnl
@@ -190,7 +194,7 @@ else
 fi
 
 # make other build directories
-for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources share/salome/doc idl
+for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources/${MODULE_NAME} share/salome/doc idl
 do
     $INSTALL -d $rep
 done

diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml
index 7ec465c7e461efdea1d59623118c979ae77a445d..4912c7e886c41402ba128b630d219c77931777ea 100644 (file)
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml
@@ -7,6 +7,6 @@
   </section>
   <section name="resources">
     <!-- Module resources -->
-    <parameter name="PYHELLO" value="${PYHELLO_ROOT_DIR}/share/salome/resources"/>
+    <parameter name="PYHELLO" value="${PYHELLO_ROOT_DIR}/share/salome/resources/pyhello"/>
   </section>
 </document>