From: inv <inv@opencascade.com>
Date: Fri, 18 Nov 2011 06:42:03 +0000 (+0000)
Subject: Update
X-Git-Tag: V6_4_0~13
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=8f9ebdd6ad2296654c47e1b38b64a7dd27d093bf;p=tools%2Finstall.git

Update
---

diff --git a/config_files/med-3.0.4.sh b/config_files/med-3.0.4.sh
index 19c4cad..f834fa2 100755
--- a/config_files/med-3.0.4.sh
+++ b/config_files/med-3.0.4.sh
@@ -79,48 +79,19 @@ install_source
 cd ${PRODUCT_SRC_DIR}
 test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 
-#vsr: provide additional flags for f95 (Mandriva 2006.0, Fedora Core 4)
-is_mandriva2008=0
-is_mandriva2010=0
-is_debian40=0
-is_debian50=0
-is_debian60=0
-
-if [ -e /etc/issue ] ; then
-  grep -e "Mandriva Linux release 2008.0" /etc/issue > /dev/null
-  if [ $? == 0 ] ; then is_mandriva2008=1 ; fi
-  grep -e "Mandriva Linux release 2010.0" /etc/issue > /dev/null
-  if [ $? == 0 ] ; then is_mandriva2010=1 ; fi
-  grep -e "Debian GNU/Linux 4.0" /etc/issue > /dev/null
-  if [ $? == 0 ] ; then is_debian40=1 ; fi
-  grep -e "Debian GNU/Linux 5.0" /etc/issue > /dev/null
-  if [ $? == 0 ] ; then is_debian50=1 ; fi
-  grep -e "Debian GNU/Linux 6.0" /etc/issue > /dev/null
-  if [ $? == 0 ] ; then is_debian60=1 ; fi
-fi
-
-if [ $is_mandriva2008 == 1 ] || [ $is_mandriva2010 == 1 ] || [ $is_debian50 == 1 ] || [ $is_debian60 == 1 ] || [ $is_debian40 == 1 ] ; then
     if test `uname -m` = "x86_64" ; then
-	if [ $is_mandriva2006 == 1 ] ; then	
-    echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS='-g -O2 -fPIC' CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG"
-    ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS="-g -O2 -fPIC" CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${PRODUCT_SRC_DIR}/errlog
-	else
-    echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS='-g -O2' CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG"
-    ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS="-g -O2" CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${PRODUCT_SRC_DIR}/errlog
-	fi
+	    echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS='-g -O2 -fPIC' CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG"
+	    ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS="-g -O2 -fPIC" CFLAGS=-m64 CXXFLAGS=-m64 >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${PRODUCT_SRC_DIR}/errlog
     else
-    echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS='-g -O2' >> ${PRODUCT_DIR}/CONFIGURE.LOG"
-    ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS="-g -O2" >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${PRODUCT_SRC_DIR}/errlog
+	echo "`pwd` -> ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS='-g -O2' >> ${PRODUCT_DIR}/CONFIGURE.LOG"
+	./configure --prefix=${PRODUCT_DIR} --disable-mesgerr FFLAGS="-g -O2" >> ${PRODUCT_DIR}/CONFIGURE.LOG 2> ${PRODUCT_SRC_DIR}/errlog
     fi
     if [ "$?" -ne "0" ] ; then
-      cat ${PRODUCT_DIR}/CONFIGURE.LOG
-      cat ${PRODUCT_SRC_DIR}/errlog >&2
-      cat ${PRODUCT_SRC_DIR}/errlog >> ${PRODUCT_DIR}/CONFIGURE.LOG
-      exit 1
+	cat ${PRODUCT_DIR}/CONFIGURE.LOG
+	cat ${PRODUCT_SRC_DIR}/errlog >&2
+	cat ${PRODUCT_SRC_DIR}/errlog >> ${PRODUCT_DIR}/CONFIGURE.LOG
+	exit 1
     fi
-else
-    check_job ${PRODUCT_DIR}/CONFIGURE.LOG ./configure --prefix=${PRODUCT_DIR} --disable-mesgerr 
-fi
 
 GCC=`which gcc`
 cat >> ${PRODUCT_DIR}/MAKE.LOG <<EOF