From 9569fbb401b6a3b5e94e8d166fb6a86ef2ff1d47 Mon Sep 17 00:00:00 2001 From: asv Date: Tue, 27 Jun 2006 07:42:41 +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/. Various configuration files (configure.in.base, make_module/conclude/commence, etc.) are changed. --- adm_local/unix/make_commence.in | 2 ++ configure.in.base | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/adm_local/unix/make_commence.in b/adm_local/unix/make_commence.in index 79373ac..2e10239 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 4ffaf29..64ae467 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=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 -- 2.39.2