From: jfa <jfa@opencascade.com>
Date: Tue, 27 Dec 2005 14:49:02 +0000 (+0000)
Subject: Join modifications from branch BR_3_1_0deb
X-Git-Tag: T_OCC_development_generic_2006_start
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a1e25e40f64ed96d3ceb4bb0803b4cf03db08260;p=plugins%2Fhybridplugin.git

Join modifications from branch BR_3_1_0deb
---

diff --git a/INSTALL b/INSTALL
index 93514aa..6371003 100644
--- a/INSTALL
+++ b/INSTALL
@@ -1,5 +1,5 @@
-This is the version 3.1.0b1 of GHS3DPLUGIN
+This is the version 3.1.0 of GHS3DPLUGIN
 Compatible with :
-	- KERNEL 3.1.0b1
-        - SALOMEGUI 3.1.0b1
-	- SMESH 3.1.0b1
+	- KERNEL 3.1.0
+        - SALOMEGUI 3.1.0
+	- SMESH 3.1.0
diff --git a/bin/VERSION b/bin/VERSION
index d754332..c016bbb 100755
--- a/bin/VERSION
+++ b/bin/VERSION
@@ -1 +1 @@
-THIS IS SALOME - GHS3DPLUGIN VERSION: 3.1.0b1
+THIS IS SALOME - GHS3DPLUGIN VERSION: 3.1.0
diff --git a/build_configure b/build_configure
index 163b463..7a78b87 100755
--- a/build_configure
+++ b/build_configure
@@ -110,7 +110,7 @@ fi
 
 # make a link allowing AC_OUTPUT to find the salome_adm/.../*.in  files
 echo "" >> configure.in_tmp1
-echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/salome_adm' >> configure.in_tmp1
+echo 'ln -fs ${KERNEL_ROOT_DIR}/salome_adm ${ROOT_SRCDIR}/.' >> configure.in_tmp1
 
 echo  "" >> configure.in_tmp1
 echo "AC_OUTPUT([ \\" >> configure.in_tmp1