X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=config_files%2Fhdf5-1.4.4.sh;h=fdce78079c430225a7afb26681393a91f6b728d2;hb=af1decc59e3bb8733afff4553de107330335513a;hp=2cd2e53ce1d9e6d1ccee0be57ffbb556ee7f97e3;hpb=cf70fd8dcae60089bcf9a5b76119555951f8b324;p=tools%2Finstall.git

diff --git a/config_files/hdf5-1.4.4.sh b/config_files/hdf5-1.4.4.sh
index 2cd2e53..fdce780 100755
--- a/config_files/hdf5-1.4.4.sh
+++ b/config_files/hdf5-1.4.4.sh
@@ -3,22 +3,16 @@
 check_version()
 {
 if [ -z "$HDF5HOME" ]; then
-    #echo "HDF5HOME doesn't set"
     return 1 
 fi
 check_lib_version libhdf5.so.0.0.0 ${HDF5HOME}/lib
 if [ "$?" -ne "0" ]; then
     return 1
 fi
-#check libhdf5.settings file in a  ${HDF5HOME}/lib
 check_lib_version libhdf5.settings ${HDF5HOME}/lib
 if [ "$?" -eq "0" ]; then
-   #check that libhdf5.settings file contains following entry:
-   #HDF5 Version:		hdf5-1.4.4
-    entry=`grep "HDF5 Version:" ${HDF5HOME}/lib/libhdf5.settings`
-    ver=`echo $entry | awk '{print $3}'` 
+    ver=`grep "HDF5 Version:" ${HDF5HOME}/lib/libhdf5.settings | awk '{print $3}'` 
     if [ "$ver" = "1.4.4" ]; then 
-	#echo "The product ${PRODUCT} has been already installed on yours system"
 	return 0
     fi
 fi
@@ -29,7 +23,7 @@ print_env()
 {
 cat > ${INSTALL_WORK}/env_${PRODUCT_TYPE}.sh <<EOF 
 #$DELIM ${PRODUCT_TYPE} $DELIM
-export HDF5HOME=\${INSTALL_ROOT}/hdf5-1.4.4
+export HDF5HOME=\${INSTALL_ROOT}/${PRODUCT}
 export PATH=\${HDF5HOME}/bin:\$PATH
 export LD_LIBRARY_PATH=\${HDF5HOME}/lib:\${LD_LIBRARY_PATH}
 ##
@@ -75,7 +69,6 @@ makedir ${PRODUCT_DIR}
 check_job ${PRODUCT_DIR}/CONFIGURE.LOG \
     ./configure --prefix=${PRODUCT_DIR} --enable-threadsafe --enable-hdf5v1_2 \
 	--enable-stream-vfd --disable-hsizet --with-pthread=/usr/include,/usr/lib 
-# find . -name .depend ! -size 0 -print
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE0.LOG <<EOF
 used gcc=$GCC
@@ -134,6 +127,7 @@ check_job ${PRODUCT_DIR}/MAKE6.LOG make
 #check_job ${PRODUCT_DIR}/MAKECHECK.LOG make check
 check_job ${PRODUCT_DIR}/MAKEINSTALL.LOG make install
 
+#du -sk ${PRODUCT_WORK} > ${PRODUCT_DIR}/size.log
 rm -fr ${PRODUCT_WORK}
 print_env
 }