From: inv Date: Thu, 10 Nov 2011 07:58:50 +0000 (+0000) Subject: Update for Salome 6.4.0 X-Git-Tag: V6_4_0~27 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=1db8ddc9cb50c2a308dba77a79595e94adab665a;p=tools%2Finstall.git Update for Salome 6.4.0 --- diff --git a/config_files/med-3.0.4.sh b/config_files/med-3.0.4.sh index 46faff0..19c4cad 100755 --- a/config_files/med-3.0.4.sh +++ b/config_files/med-3.0.4.sh @@ -12,6 +12,8 @@ # #################################################################################### +MEDVERSION=3.0.4 + check_version() { if [ -z "$MED2HOME" ]; then @@ -78,38 +80,26 @@ 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_mandriva2006=0 -is_mandriva2007=0 is_mandriva2008=0 +is_mandriva2010=0 is_debian40=0 -is_fedora4=0 -is_fedora6=0 +is_debian50=0 +is_debian60=0 if [ -e /etc/issue ] ; then - grep -e "Mandriva Linux release 2006.0" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_mandriva2006=1 ; fi - grep -e "Mandriva Linux release 2007.0" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_mandriva2007=1 ; fi 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 "Fedora Core release 4" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_fedora4=1 ; fi - grep -e "Fedora Core release 6" /etc/issue > /dev/null - if [ $? == 0 ] ; then is_fedora6=1 ; fi -fi - -if [ $is_mandriva2006 == 1 ] ; then -chmod +w ./Makefile.am -mv Makefile.am Makefile.am.orig -sed -e 's/include src tests tools doc/include src tools doc/g' Makefile.am.orig > Makefile.am -chmod +w ./Makefile.in -mv Makefile.in Makefile.in.orig -sed -e 's/include src tests tools doc/include src tools doc/g' Makefile.in.orig > Makefile.in + 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_mandriva2006 == 1 ] || [ $is_mandriva2007 == 1 ] || [ $is_mandriva2008 == 1 ] || [ $is_fedora4 == 1 ] || [ $is_fedora6 == 1 ] || [ $is_debian40 == 1 ] ; then +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" @@ -222,7 +212,7 @@ shift REMOVE_SRC_TMP=$8; shift SINGLE_DIR=$9 -export PRODUCT="med-3.0.4" +export PRODUCT="med-${MEDVERSION}" export PRODUCT_DIR=${INST_ROOT}/${SINGLE_DIR:-${PRODUCT}} export PRODUCT_WORK=${INSTALL_WORK}/${PRODUCT} export PRODUCT_SRC_DIR=${INST_ROOT}/${PRODUCT}_SRC