Modification for correct processing la files

diff --git a/config_files/graphviz-2.2.1.sh b/config_files/graphviz-2.2.1.sh
index 7d4ddbffa1733c6943c1fe0195c0dcc205ebcc0c..3ece5f85b0c229c8059ee77832a58f0c833abf1e 100755 (executable)
--- 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 8cb64b29bf199aba117de6f40bdbd65e9161610f..6c74fbc6bef341737eba4aa11aa0c5ff1dc3ced5 100755 (executable)
--- 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