From eba1a5f7b732ced941c653ee6ec4e0fee80b950e Mon Sep 17 00:00:00 2001 From: maintenance team Date: Wed, 10 Oct 2007 14:10:06 +0000 Subject: [PATCH] Modification for correct processing la files --- config_files/graphviz-2.2.1.sh | 7 ++++++- config_files/med-2.2.3.sh | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/config_files/graphviz-2.2.1.sh b/config_files/graphviz-2.2.1.sh index 7d4ddbf..3ece5f8 100755 --- a/config_files/graphviz-2.2.1.sh +++ b/config_files/graphviz-2.2.1.sh @@ -111,7 +111,12 @@ for l in `ls *.la`; do sed -e "s%${libdir}%${PRODUCT_DIR}/lib/graphviz%g" $l > _$l libdir=`dirname $libdir` sed -e "s%${libdir}%${PRODUCT_DIR}/lib/graphviz%g" _$l > $l - rm -f _$l + tmp="" + if [ -n "${TCLHOME}" ]; then + tmp="-L${TCLHOME}/lib" + fi + sed -e "s%-L[^[:space:]]*/tcltk-[0-9]\+\.[0-9]\+\.[0-9]\+/lib[[:space:]]%$tmp %g" $l > _$l + mv -f _$l $l chmod a+x $l done diff --git a/config_files/med-2.2.3.sh b/config_files/med-2.2.3.sh index 8cb64b2..6c74fbc 100755 --- a/config_files/med-2.2.3.sh +++ b/config_files/med-2.2.3.sh @@ -161,9 +161,9 @@ tmp="" if [ -n "${HDF5HOME}" ]; then tmp="-L${HDF5HOME}/lib" fi -sed -e "s%\(.*\)\([[:space:]].*-L.*/hdf5-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" libmed.la > libmed.la.new +sed -e "s%\(-L[^[:space:]]*/hdf5-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)%$tmp %g" libmed.la > libmed.la.new 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 +sed -e "s%\(-L[^[:space:]]*/hdf5-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)%$tmp %g" libmedC.la > libmedC.la.new mv -f libmedC.la.new libmedC.la chmod 755 libmed.la -- 2.39.2