From 7f54f1396ca976021f5be00a23c2a015e9d9811a Mon Sep 17 00:00:00 2001 From: maintenance team Date: Wed, 23 Apr 2008 13:13:53 +0000 Subject: [PATCH] *** empty log message *** --- config_files/med-2.3.2.sh | 7 ------- config_files/sip-4.7.3.sh | 2 +- 2 files changed, 1 insertion(+), 8 deletions(-) diff --git a/config_files/med-2.3.2.sh b/config_files/med-2.3.2.sh index 3f3c115..d474f64 100755 --- a/config_files/med-2.3.2.sh +++ b/config_files/med-2.3.2.sh @@ -163,15 +163,8 @@ mv -f libmed.la.new libmed.la sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmedC.la > libmedC.la.new mv -f libmedC.la.new libmedC.la -sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmedimport.la > libmedimport.la.new -mv -f libmedimport.la.new libmedimport.la -sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmedimportcxx.la > libmedimportcxx.la.new -mv -f libmedimportcxx.la.new libmedimportcxx.la - chmod 755 libmed.la chmod 755 libmedC.la -chmod 755 libmedimport.la -chmod 755 libmedimportcxx.la ### modify scripts to correct installation path cd ${PRODUCT_DIR}/bin diff --git a/config_files/sip-4.7.3.sh b/config_files/sip-4.7.3.sh index 669bd5e..b117f4e 100755 --- a/config_files/sip-4.7.3.sh +++ b/config_files/sip-4.7.3.sh @@ -132,7 +132,7 @@ if [ -n "${PYTHONHOME}" ] && [ -n "${QTDIR}" ] ; then fi cd ${PRODUCT_DIR}/lib${LIB_PREFIX}/python${PYTHON_VERSION}/site-packages python_version=`python -V 2>&1 | awk '{print $2}' | awk -F. '{printf("0x%02d%02d%02d",$1,$2,$3)}'` - qt_version=`grep -e "^#define[[:space:]]\+QT_VERSION[[:space:]]\+" ${QTDIR}/include/QT/qglobal.h | sed -e 's%^#define[[:space:]\+QT_VERSION[[:space:]]\+\(.*\)$%\1%g'` + qt_version=`grep -e "^#define[[:space:]]\+QT_VERSION[[:space:]]\+" ${QTDIR}/include/Qt/qglobal.h | sed -e 's%^#define[[:space:]\+QT_VERSION[[:space:]]\+\(.*\)$%\1%g'` sed -e "s%\('default_bin_dir':[[:space:]]*\).*%\1'${PYTHONHOME}/bin',%g" sipconfig.py > sipconfig.py.1 sed -e "s%\('default_mod_dir':[[:space:]]*\).*%\1'${PYTHONHOME}/lib/python${PYTHON_VERSION}/site-packages',%g" sipconfig.py.1 > sipconfig.py sed -e "s%\('default_sip_dir':[[:space:]]*\).*%\1'${PRODUCT_DIR}/sip',%g" sipconfig.py > sipconfig.py.1 -- 2.39.2