]> SALOME platform Git repositories - tools/install.git/commitdiff
Salome HOME
Fix pb with improper la files modification
authorvsr <vsr@opencascade.com>
Thu, 18 Apr 2013 15:09:31 +0000 (15:09 +0000)
committervsr <vsr@opencascade.com>
Thu, 18 Apr 2013 15:09:31 +0000 (15:09 +0000)
config_files/ftgl.sh
config_files/med.sh

index 979a82befce8df0261b8c03176142fcbcde6d348..30d11c830def7f3493d66a17cfe7de52211b022d 100755 (executable)
@@ -129,7 +129,7 @@ check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 if [ -f ${PRODUCT_DIR}/lib/libftgl.la ] ; then
     cd ${PRODUCT_DIR}/lib
     sed -i "s%\(.*\)\([[:space:]].*libfreetype.la\)\(.*\)%\1 -lfreetype\3%g;s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" libftgl.la
-    sed -i "s%\(.*\)\([[:space:]].*-L.*/freetype-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${FREETYPEDIR}/lib \3%g" libftgl.la
+    sed -i "s%\(.*\)\([[:space:]].*-L.*/freetype-[0-9]\+\.[0-9]\+\.[0-9]\+/lib[[:space:]]\)\(.*\)%\1 -L${FREETYPEDIR}/lib \3%g" libftgl.la
 fi
 
 # modify pkgconfig
index 45f3761f0e758dca0d133c06fa9ff20f3c636ebd..02f8b200e4bc5b69f7ffc709c31d85a601c1d206 100755 (executable)
@@ -135,7 +135,7 @@ if [ -n "${HDF5HOME}" ]; then
 fi
 for fl in libmed.la libmedC.la libmedimport.la ; do
     sed -i "s%\(.*\)\([[:space:]].*libhdf5.la\)\(.*\)%\1 -lhdf5\3%g;s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g" ${fl}
-    sed -i "s%\(.*\)\([[:space:]].*-L.*/hdf5-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" ${fl}
+    sed -i "s%\(.*\)\([[:space:]].*-L.*/hdf5-[0-9]\+\.[0-9]\+\.[0-9]\+/lib[[:space:]]\)\(.*\)%\1 $tmp \3%g" ${fl}
     sed -i "s%\(.*\)\([[:space:]].*-L../../src/\)\(.*\)%\1\3%g;s%\(.*\)\([[:space:]].*libmed.la\)\(.*\)%\1 ${PRODUCT_DIR}/lib/libmed.la \3%g" ${fl}
 done