From: asv Date: Tue, 27 Jun 2006 07:45:55 +0000 (+0000) Subject: Fix to bug PAL10465. X-Git-Tag: For_OCT_611~1 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=30b91f740574087601690ac3ed802392e792d1bf;p=plugins%2Fnetgenplugin.git Fix to bug PAL10465. Modification of resource files location in "build" and "installation" directories. Now resource files are placed in share/salome/resources/. 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 19336a2..e0a24f9 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 42a557a..e506569 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=netgenplugin +AC_SUBST(MODULE_NAME) + dnl dnl Initialize source and build root directories dnl @@ -356,7 +360,7 @@ else fi # make other build directories -for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources idl +for rep in salome_adm adm_local doc bin/salome include/salome lib/salome share/salome/resources/${MODULE_NAME} idl do # if test ! -d $rep ; then # eval mkdir $rep