From d20cfb771c03216319c54e38992ca8925b0870c6 Mon Sep 17 00:00:00 2001
From: vsr <vsr@opencascade.com>
Date: Tue, 16 Apr 2013 15:07:35 +0000
Subject: [PATCH] Minor changes

---
 config_CentOS_5.5_64bit.xml              |  4 ++--
 config_Debian_6.0_64bit.xml              |  4 ++--
 config_Mandriva_2010.0.xml               |  4 ++--
 config_Mandriva_2010.0_64bit.xml         |  4 ++--
 config_files/freeimage.sh                | 18 ++++++++----------
 config_files/{tbb30_018oss.sh => tbb.sh} |  6 +++---
 6 files changed, 19 insertions(+), 21 deletions(-)
 rename config_files/{tbb30_018oss.sh => tbb.sh} (97%)

diff --git a/config_CentOS_5.5_64bit.xml b/config_CentOS_5.5_64bit.xml
index 29293b9..700b277 100755
--- a/config_CentOS_5.5_64bit.xml
+++ b/config_CentOS_5.5_64bit.xml
@@ -170,7 +170,7 @@
 	     description="SALOME platform PYCALCULATOR module">
       <installation os="CentOS 5.5 64bit"
                     version="7.2.0" 
-		    disable="false"
+		    disable="true"
 		    installdiskspace="220,2060,5764"
 		    script="PYCALCULATOR.sh"/>
     </product>
@@ -489,7 +489,7 @@
                     version="30_018oss"
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="tbb30_018oss.sh"/>
+		    script="tbb.sh"/>
     </product>
     <product name="OpenCascade" 
 	     type="prerequisite"
diff --git a/config_Debian_6.0_64bit.xml b/config_Debian_6.0_64bit.xml
index 9f1ff83..8fe0284 100755
--- a/config_Debian_6.0_64bit.xml
+++ b/config_Debian_6.0_64bit.xml
@@ -170,7 +170,7 @@
 	     description="SALOME platform PYCALCULATOR module">
       <installation os="Debian 6.0 64bit"
                     version="7.2.0" 
-		    disable="false"
+		    disable="true"
 		    installdiskspace="220,2060,5764"
 		    script="PYCALCULATOR.sh"/>
     </product>
@@ -489,7 +489,7 @@
                     version="30_018oss"
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="tbb30_018oss.sh"/>
+		    script="tbb.sh"/>
     </product>
     <product name="OpenCascade" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0.xml b/config_Mandriva_2010.0.xml
index bfd8945..1db26ba 100755
--- a/config_Mandriva_2010.0.xml
+++ b/config_Mandriva_2010.0.xml
@@ -170,7 +170,7 @@
 	     description="SALOME platform PYCALCULATOR module">
       <installation os="Mandriva 2010.0"
                     version="7.2.0" 
-		    disable="false"
+		    disable="true"
 		    installdiskspace="220,2060,5764"
 		    script="PYCALCULATOR.sh"/>
     </product>
@@ -489,7 +489,7 @@
                     version="30_018oss"
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="tbb30_018oss.sh"/>
+		    script="tbb.sh"/>
     </product>
     <product name="OpenCascade" 
 	     type="prerequisite"
diff --git a/config_Mandriva_2010.0_64bit.xml b/config_Mandriva_2010.0_64bit.xml
index ea779b7..ed15f9f 100755
--- a/config_Mandriva_2010.0_64bit.xml
+++ b/config_Mandriva_2010.0_64bit.xml
@@ -170,7 +170,7 @@
 	     description="SALOME platform PYCALCULATOR module">
       <installation os="Mandriva 2010.0 64bit"
                     version="7.2.0" 
-		    disable="false"
+		    disable="true"
 		    installdiskspace="220,2060,5764"
 		    script="PYCALCULATOR.sh"/>
     </product>
@@ -489,7 +489,7 @@
                     version="30_018oss"
 		    disable="false"
 		    installdiskspace="86460,273932,478152"
-		    script="tbb30_018oss.sh"/>
+		    script="tbb.sh"/>
     </product>
     <product name="OpenCascade" 
 	     type="prerequisite"
diff --git a/config_files/freeimage.sh b/config_files/freeimage.sh
index 117891e..d57380f 100755
--- a/config_files/freeimage.sh
+++ b/config_files/freeimage.sh
@@ -86,18 +86,16 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 # [-]
 local patch_build_procedure=1
 if [ "${patch_build_procedure}" = "1" ] ; then
-    echo -n ".. Patching freeimage sources: fix build procedure..." && \
-	cd ${PRODUCT_SRC_DIR} && \
-	sed -i "s%DESTDIR ?= /%DESTDIR ?= /usr%g;s%INCDIR ?= \$(DESTDIR)/usr/include%INCDIR ?= \$(DESTDIR)/include%g;s%INSTALLDIR ?= \$(DESTDIR)/usr/lib%INSTALLDIR ?= \$(DESTDIR)/lib%g;s%-o root -g root %%g" Makefile.gnu >& /dev/null && \
-	sed -i "s%DESTDIR ?= /%DESTDIR ?= /usr%g;s%INCDIR ?= \$(DESTDIR)/usr/include%INCDIR ?= \$(DESTDIR)/include%g;s%INSTALLDIR ?= \$(DESTDIR)/usr/lib%INSTALLDIR ?= \$(DESTDIR)/lib%g;s%-o root -g root %%g" Makefile.fip >& /dev/null
+    cd ${PRODUCT_SRC_DIR}
+    sed -i "s%DESTDIR ?= /%DESTDIR ?= /usr%g;s%INCDIR ?= \$(DESTDIR)/usr/include%INCDIR ?= \$(DESTDIR)/include%g;s%INSTALLDIR ?= \$(DESTDIR)/usr/lib%INSTALLDIR ?= \$(DESTDIR)/lib%g;s%-o root -g root %%g" Makefile.gnu
+    sed -i "s%DESTDIR ?= /%DESTDIR ?= /usr%g;s%INCDIR ?= \$(DESTDIR)/usr/include%INCDIR ?= \$(DESTDIR)/include%g;s%INSTALLDIR ?= \$(DESTDIR)/usr/lib%INSTALLDIR ?= \$(DESTDIR)/lib%g;s%-o root -g root %%g" Makefile.fip
 fi
 
 # [-]
 local patch_gcc47_compat=1
 if [ "${patch_gcc47_compat}" = "1" ] ; then
-    echo -n ".. Patching freeimage sources: gcc 4.7 compatibility..." && \
-	cd ${PRODUCT_SRC_DIR} && \
-	sed -i 's%\(#include "OpenEXRConfig.h"\)%\1\n#include <string.h>%g' Source/OpenEXR/IlmImf/ImfAutoArray.h >& /dev/null
+    cd ${PRODUCT_SRC_DIR}
+    sed -i 's%\(#include "OpenEXRConfig.h"\)%\1\n#include <string.h>%g' Source/OpenEXR/IlmImf/ImfAutoArray.h
 fi
 
 cd ${PRODUCT_SRC_DIR}
@@ -110,8 +108,8 @@ check_job ${PRODUCT_DIR}/MAKE.LOG make -f Makefile.gnu
 # install
 check_job ${PRODUCT_DIR}/INSTALL.LOG make -f Makefile.gnu DESTDIR=${PRODUCT_DIR} install 
 
-# clean temporary files. 
-make -f Makefile.fip clean 
+# clean temporary files
+make -f Makefile.gnu clean 
 
 ## building FreeImagePlus library
 
@@ -121,7 +119,7 @@ check_job ${PRODUCT_DIR}/MAKEPLUS.LOG make -f Makefile.fip
 # install
 check_job ${PRODUCT_DIR}/INSTALLPLUS.LOG make -f Makefile.fip DESTDIR=${PRODUCT_DIR} install 
 
-# clean temporary files. 
+# clean temporary files
 make -f Makefile.fip clean 
 
 cd ${PRODUCT_DIR};
diff --git a/config_files/tbb30_018oss.sh b/config_files/tbb.sh
similarity index 97%
rename from config_files/tbb30_018oss.sh
rename to config_files/tbb.sh
index 19be85c..cd048ea 100755
--- a/config_files/tbb30_018oss.sh
+++ b/config_files/tbb.sh
@@ -1,7 +1,7 @@
 #!/bin/bash -noprofile
 
 ####################################################################################
-#  File      : tbb30_018oss.sh
+#  File      : tbb.sh
 #  Created   : Thu Dec 18 12:01:00 2002
 #  Author    : Vadim SANDLER, Open CASCADE SAS (vadim.sandler@opencascade.com)
 #  Project   : SALOME
@@ -12,7 +12,7 @@
 #
 ####################################################################################
 
-
+TBB_VERSION=30_018oss
 TBBKERNEL='cc4.1.0_libc2.4_kernel2.6.16.21'
 
 if test `uname -m` = "x86_64" ; then
@@ -93,7 +93,7 @@ REMOVE_SRC_TMP=$9;
 shift
 BIN_DIR=$9;
 test $# == 10 && shift && SINGLE_DIR=$9
-export PRODUCT="tbb30_018oss"
+export PRODUCT="tbb${TBB_VERSION}"
 export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}}
 export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT}
 export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC
-- 
2.39.2