Join modifications from branch BR_3_1_0deb

diff --git a/INSTALL b/INSTALL
index 93514aa7ad0a8b9ab7133050c6f8c994d9456a33..6371003445e1dcdb671307af64e09b6c0457007b 100644 (file)
--- 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 d754332d340da321364a7b686727f8d3f301ee9c..c016bbbfdfd5460670d19600b7b67a69792db0dc 100755 (executable)
--- 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 163b46353966578bcb6e2b78d4ec6975305d53f4..7a78b872ba1672931da607c1c5f6cf23ce7fe6c1 100755 (executable)
--- 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