From: admin <salome-admin@opencascade.com>
Date: Fri, 25 Aug 2006 07:09:11 +0000 (+0000)
Subject: This commit was generated by cvs2git to create branch 'BR_Dev_For_4_0'.
X-Git-Tag: V3_2_2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=90e60e9d4a79bba99a04cd76617c634a0c7070cf;p=plugins%2Fnetgenplugin.git

This commit was generated by cvs2git to create branch 'BR_Dev_For_4_0'.

Sprout from master 2006-06-01 11:42:55 UTC jfa <jfa@opencascade.com> 'Join modifications from branch BR_DEBUG_3_2_0b1'
Cherrypick from V3_2_0_maintainance 2006-08-25 07:09:10 UTC vsr <vsr@opencascade.com> 'Increment version number: 3.2.2':
    adm_local/unix/make_commence.in
    configure.in.base
    src/NETGEN/ReadMeForNgUsers
---

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..4bf0796 100644
--- a/configure.in.base
+++ b/configure.in.base
@@ -22,11 +22,15 @@ AC_CANONICAL_HOST
 PACKAGE=salome
 AC_SUBST(PACKAGE)
 
-VERSION=3.2.0
-XVERSION=0x030200
+VERSION=3.2.2
+XVERSION=0x030202
 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
diff --git a/src/NETGEN/ReadMeForNgUsers b/src/NETGEN/ReadMeForNgUsers
index 4abb2b1..e14d714 100644
--- a/src/NETGEN/ReadMeForNgUsers
+++ b/src/NETGEN/ReadMeForNgUsers
@@ -9,6 +9,11 @@ Patch the netgen 4.5 distribution:
 $ cd netgen45
 $ patch -p1 < patch_directory/netgen45ForSalome.patch
 
+Set CASROOT environment variable to OCCT installation path,
+as Netgen 4.5 uses Open CASCADE Technology:
+
+$ setenv CASROOT <occt_installation_path>
+
 Then run makeForSalome.sh (it will be created by the patch):
 $ sh makeForSalome.sh
 
@@ -72,7 +77,7 @@ nglib.o and ngnewdelete.o to the library libnginterface.a and
 recompile the libraries only.
 All this job is done by applying the patch and running the script makeForSalome.sh.
 
-Th suggested patch alters some Netgen sources to compile them.
+The suggested patch alters some Netgen sources to compile them.
 
 Michael SAZONOV
 m-sazonov@opencascade.com