Samll update

diff --git a/config_Debian_3.1.xml b/config_Debian_3.1.xml
index e7f3e82221a7ec05f9f3e0f62f547afb3bccbfdb..aa64efba1e81ed0d1d17ddd90354b23ca4ab05e7 100755 (executable)
--- a/config_Debian_3.1.xml
+++ b/config_Debian_3.1.xml
@@ -99,16 +99,6 @@
                    installdiskspace="232,120,2583"
                    script="GHS3DPLUGIN.sh"/>
     </product>
-    <product name="GHS3DPLUGIN" 
-             type="component"
-            description="SALOME platform GHS3D meshing algorithm plugin. For use this plugin you should add the path to ghs3d to your PATH environment variable.">
-      <installation os="Debian 3.1"
-                    version="5.1.3" 
-                   disable="false"
-                   woguimode="true"
-                   installdiskspace="232,120,2583"
-                   script="GHS3DPLUGIN.sh"/>
-    </product>
     <product name="GHS3DPRLPLUGIN" 
              type="component"
             description="SMESH plugin from CEA">

diff --git a/config_Debian_4.0.xml b/config_Debian_4.0.xml
index 5a12d595fed1b80e5f1305d875b9ee1b53cd9902..6b2c44d86e649533930584acc1dc3208b12f1fba 100755 (executable)
--- a/config_Debian_4.0.xml
+++ b/config_Debian_4.0.xml
@@ -99,16 +99,6 @@
                    installdiskspace="232,120,2583"
                    script="GHS3DPLUGIN.sh"/>
     </product>
-    <product name="GHS3DPLUGIN" 
-             type="component"
-            description="SALOME platform GHS3D meshing algorithm plugin. For use this plugin you should add the path to ghs3d to your PATH environment variable.">
-      <installation os="Debian 4.0"
-                    version="5.1.3" 
-                   disable="false"
-                   woguimode="true"
-                   installdiskspace="232,120,2583"
-                   script="GHS3DPLUGIN.sh"/>
-    </product>
     <product name="GHS3DPRLPLUGIN" 
              type="component"
             description="SMESH plugin from CEA">

diff --git a/config_Debian_4.0_64bit.xml b/config_Debian_4.0_64bit.xml
index 960565cefd3b88a483e75f6089b2d7b62b8cd905..16b95fc67e9f855be5fd5c62172b9477cb9756f5 100755 (executable)
--- a/config_Debian_4.0_64bit.xml
+++ b/config_Debian_4.0_64bit.xml
@@ -99,16 +99,6 @@
                    installdiskspace="232,120,2583"
                    script="GHS3DPLUGIN.sh"/>
     </product>
-    <product name="GHS3DPLUGIN" 
-             type="component"
-            description="SALOME platform GHS3D meshing algorithm plugin. For use this plugin you should add the path to ghs3d to your PATH environment variable.">
-      <installation os="Debian 4.0 64bit"
-                    version="5.1.3" 
-                   disable="false"
-                   woguimode="true"
-                   installdiskspace="232,120,2583"
-                   script="GHS3DPLUGIN.sh"/>
-    </product>
     <product name="GHS3DPRLPLUGIN" 
              type="component"
             description="SMESH plugin from CEA">

diff --git a/config_Mandriva_2006.0.xml b/config_Mandriva_2006.0.xml
index 54583a387bb0a2993f8f30ec34900feacc72d876..53a03d155981ccf6c2a144a9816f9006dddacdc5 100755 (executable)
--- a/config_Mandriva_2006.0.xml
+++ b/config_Mandriva_2006.0.xml
@@ -99,16 +99,6 @@
                    installdiskspace="232,120,2583"
                    script="GHS3DPLUGIN.sh"/>
     </product>
-    <product name="GHS3DPLUGIN" 
-             type="component"
-            description="SALOME platform GHS3D meshing algorithm plugin. For use this plugin you should add the path to ghs3d to your PATH environment variable.">
-      <installation os="Mandriva 2006.0"
-                    version="5.1.3" 
-                   disable="false"
-                   woguimode="true"
-                   installdiskspace="232,120,2583"
-                   script="GHS3DPLUGIN.sh"/>
-    </product>
     <product name="GHS3DPRLPLUGIN" 
              type="component"
             description="SMESH plugin from CEA">

diff --git a/config_Mandriva_2006.0_64bit.xml b/config_Mandriva_2006.0_64bit.xml
index 31823beb49426f8c78d267bdca7a6862d957691e..52407f2c3389bb6d51203da06d5c8684b23b852d 100755 (executable)
--- a/config_Mandriva_2006.0_64bit.xml
+++ b/config_Mandriva_2006.0_64bit.xml
@@ -99,16 +99,6 @@
                    installdiskspace="232,120,2583"
                    script="GHS3DPLUGIN.sh"/>
     </product>
-    <product name="GHS3DPLUGIN" 
-             type="component"
-            description="SALOME platform GHS3D meshing algorithm plugin. For use this plugin you should add the path to ghs3d to your PATH environment variable.">
-      <installation os="Mandriva 2006.0 64bit"
-                    version="5.1.3" 
-                   disable="false"
-                   woguimode="true"
-                   installdiskspace="232,120,2583"
-                   script="GHS3DPLUGIN.sh"/>
-    </product>
     <product name="GHS3DPRLPLUGIN" 
              type="component"
             description="SMESH plugin from CEA">

diff --git a/config_Mandriva_2008.0.xml b/config_Mandriva_2008.0.xml
index 13a574e2d02a19aa85e88a09debc48522f29c494..6cf39dd64e64232c26e6065e86facd996c47f2c7 100755 (executable)
--- a/config_Mandriva_2008.0.xml
+++ b/config_Mandriva_2008.0.xml
@@ -99,16 +99,6 @@
                    installdiskspace="232,120,2583"
                    script="GHS3DPLUGIN.sh"/>
     </product>
-    <product name="GHS3DPLUGIN" 
-             type="component"
-            description="SALOME platform GHS3D meshing algorithm plugin. For use this plugin you should add the path to ghs3d to your PATH environment variable.">
-      <installation os="Mandriva 2008.0"
-                    version="5.1.3" 
-                   disable="false"
-                   woguimode="true"
-                   installdiskspace="232,120,2583"
-                   script="GHS3DPLUGIN.sh"/>
-    </product>
     <product name="GHS3DPRLPLUGIN" 
              type="component"
             description="SMESH plugin from CEA">

diff --git a/config_Mandriva_2008.0_64bit.xml b/config_Mandriva_2008.0_64bit.xml
index 33e3aba18d6770f3fa042951ce534dc7a72661d4..4fefd3ca613afde5f61090cf5ffcc156617d781f 100755 (executable)
--- a/config_Mandriva_2008.0_64bit.xml
+++ b/config_Mandriva_2008.0_64bit.xml
@@ -99,16 +99,6 @@
                    installdiskspace="232,120,2583"
                    script="GHS3DPLUGIN.sh"/>
     </product>
-    <product name="GHS3DPLUGIN" 
-             type="component"
-            description="SALOME platform GHS3D meshing algorithm plugin. For use this plugin you should add the path to ghs3d to your PATH environment variable.">
-      <installation os="Mandriva 2008.0 64bit"
-                    version="5.1.3" 
-                   disable="false"
-                   woguimode="true"
-                   installdiskspace="232,120,2583"
-                   script="GHS3DPLUGIN.sh"/>
-    </product>
     <product name="GHS3DPRLPLUGIN" 
              type="component"
             description="SMESH plugin from CEA">

diff --git a/config_files/common.sh b/config_files/common.sh
index 3477d8f562574d22a80af24b7cb752c419645d0e..00cc9dcb57096d47bf23e3bfd14cc82c06977b03 100755 (executable)
--- a/config_files/common.sh
+++ b/config_files/common.sh
@@ -806,7 +806,7 @@ if [ "$l" != "X" ] ; then
     # 15. process libxml dependencies
     libxmldir=`printenv LIBXML_DIR`/lib
     if [ ! -d ${libxmldir} ] ; then libxmldir=`printenv  LIBXML_DIR`/lib ; fi
-    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*libxml2-[0-9]\.[0-9]\.[0-9]/lib% \1${libxmldir}%g" $l > $l"_"
+    sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*libxml2-[0-9]\.[0-9]\.[0-9][0-9]/lib% \1${libxmldir}%g" $l > $l"_"
     mv -f $l"_" $l     
     sed -e "s%[[:space:]]\(-L\)\?[^[:space:]]*libxml2/lib% \1${libxmldir}%g" $l > $l"_"
     mv -f $l"_" $l