From: vsr <vsr@opencascade.com>
Date: Tue, 23 Apr 2013 11:01:26 +0000 (+0000)
Subject: Fix minor problems
X-Git-Tag: V7_2_0rc2~3
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=7033fb49ada7021ddaf1a6bddf6f7e8ab8d6c877;p=tools%2Finstall.git

Fix minor problems
---

diff --git a/config_files/netgen.sh b/config_files/netgen.sh
index e77c033..345a8cf 100755
--- a/config_files/netgen.sh
+++ b/config_files/netgen.sh
@@ -145,51 +145,50 @@ test -z ${SINGLE_DIR} && makedir ${PRODUCT_DIR} || mkdir -p ${PRODUCT_DIR}
 check_jb tar xfz ${SOURCE_DIR}/${PRODUCT}.tar.gz -C ${PRODUCT_DIR}
 
 ### modifing la files
-cd ${PRODUCT_DIR}/lib
-freetypedir=`printenv FREETYPEDIR`
-ftgldir=`printenv FTGLDIR`
-gl2psdir=`printenv GL2PSHOME`
-freeimagedir=`printenv FREEIMAGEDIR`
-tbbbasedir=`printenv TBBHOME`
-
-TBBKERNEL='cc4.1.0_libc2.4_kernel2.6.16.21'
-if test `uname -m` = "x86_64" ; then
-    export TBBMODE="intel64/$TBBKERNEL"
-else
-    export TBBMODE="ia32/$TBBKERNEL"
-fi
+if [ -f ${PRODUCT_DIR}/lib/libnglib.la ] ; then
 
-tbbdir=${tbbbasedir}/lib/$TBBMODE
+    cd ${PRODUCT_DIR}/lib
 
-if [ -n "${freetypedir}" ] && [ -d "${freetypedir}" ] ; then
-    sed -e "s%\(.*\)\([[:space:]].*-L.*/freetype-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freetypedir}/lib \3%g" \
-        -e 's%\(.*\)\([[:space:]].*libfreetype.la\)\(.*\)%\1 -lfreetype \3%g' libnglib.la > _libnglib.la
-    mv -f _libnglib.la libnglib.la
-fi
-chmod a+x libnglib.la
-if [ -n "${ftgldir}" ] && [ -d "${ftgldir}" ] ; then
-    sed -e "s%\(.*\)\([[:space:]].*-L.*/ftgl-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${ftgldir}/lib \3%g" \
-        -e 's%\(.*\)\([[:space:]].*libftgl.la\)\(.*\)%\1 -lftgl \3%g' libnglib.la > _libnglib.la
-    mv -f _libnglib.la libnglib.la
-fi
-chmod a+x libnglib.la
-if [ -n "${gl2psdir}" ] && [ -d "${gl2psdir}" ] ; then
-    sed -e "s%\(.*\)\([[:space:]].*-L.*/gl2ps-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${gl2psdir}/lib \3%g" libnglib.la > _libnglib.la
-    mv -f _libnglib.la libnglib.la
-fi
-chmod a+x libnglib.la
-if [ -n "${freeimagedir}" ] && [ -d "${freeimagedir}" ] ; then
-    sed -e "s%\(.*\)\([[:space:]].*-L.*/freeimage[^[:space:]]*/lib[[:space:]]\)\(.*\)%\1 -L${freeimagedir}/lib \3%g" libnglib.la > _libnglib.la
-    mv -f _libnglib.la libnglib.la
-fi
-chmod a+x libnglib.la
-if [ -n "${tbbdir}" ] && [ -d "${tbbdir}" ] ; then
-    sed -e "s%\(.*\)\([[:space:]].*-L.*/tbb[^[:space:]]*/lib[^[:space:]]*\)\(.*\)%\1 -L${tbbdir} \3%g" libnglib.la > _libnglib.la
-    mv -f _libnglib.la libnglib.la
-fi
-chmod a+x libnglib.la
+    freetypedir=`printenv FREETYPEDIR`
+    ftgldir=`printenv FTGLDIR`
+    gl2psdir=`printenv GL2PSHOME`
+    freeimagedir=`printenv FREEIMAGEDIR`
+    tbbbasedir=`printenv TBBHOME`
 
-sed -i "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g;s%[[:space:]]-L[^[:space:]]*\(OCCT\|CAS\)[^[:space:]]*/lib\?% -L${CASROOT}/lib%g;s%[[:space:]][^[:space:]]*\(OCCT\|CAS\)[^[:space:]]*/lib/lib\?% ${CASROOT}/lib/lib%g" libnglib.la
+    TBBKERNEL='cc4.1.0_libc2.4_kernel2.6.16.21'
+    if test `uname -m` = "x86_64" ; then
+	export TBBMODE="intel64/$TBBKERNEL"
+    else
+	export TBBMODE="ia32/$TBBKERNEL"
+    fi
+    tbbdir=${tbbbasedir}/lib/$TBBMODE
+
+    if [ -n "${freetypedir}" ] && [ -d "${freetypedir}" ] ; then
+	sed -e "s%\(.*\)\([[:space:]].*-L.*/freetype-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${freetypedir}/lib \3%g" \
+            -e 's%\(.*\)\([[:space:]].*libfreetype.la\)\(.*\)%\1 -lfreetype \3%g' libnglib.la > _libnglib.la
+	mv -f _libnglib.la libnglib.la
+    fi
+    if [ -n "${ftgldir}" ] && [ -d "${ftgldir}" ] ; then
+	sed -e "s%\(.*\)\([[:space:]].*-L.*/ftgl-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${ftgldir}/lib \3%g" \
+            -e 's%\(.*\)\([[:space:]].*libftgl.la\)\(.*\)%\1 -lftgl \3%g' libnglib.la > _libnglib.la
+	mv -f _libnglib.la libnglib.la
+    fi
+    if [ -n "${gl2psdir}" ] && [ -d "${gl2psdir}" ] ; then
+	sed -e "s%\(.*\)\([[:space:]].*-L.*/gl2ps-[0-9]\.[0-9]\.[0-9]/lib[[:space:]]\)\(.*\)%\1 -L${gl2psdir}/lib \3%g" libnglib.la > _libnglib.la
+	mv -f _libnglib.la libnglib.la
+    fi
+    if [ -n "${freeimagedir}" ] && [ -d "${freeimagedir}" ] ; then
+	sed -e "s%\(.*\)\([[:space:]].*-L.*/freeimage[^[:space:]]*/lib[[:space:]]\)\(.*\)%\1 -L${freeimagedir}/lib \3%g" libnglib.la > _libnglib.la
+	mv -f _libnglib.la libnglib.la
+    fi
+    if [ -n "${tbbdir}" ] && [ -d "${tbbdir}" ] ; then
+	sed -e "s%\(.*\)\([[:space:]].*-L.*/tbb[^[:space:]]*/lib[^[:space:]]*\)\(.*\)%\1 -L${tbbdir} \3%g" libnglib.la > _libnglib.la
+	mv -f _libnglib.la libnglib.la
+    fi
+
+    sed -i "s%^libdir='\(.*\)'%libdir='${PRODUCT_DIR}/lib'%g;s%[[:space:]]-L[^[:space:]]*\(OCCT\|CAS\)[^[:space:]]*/lib\?% -L${CASROOT}/lib%g;s%[[:space:]][^[:space:]]*\(OCCT\|CAS\)[^[:space:]]*/lib/lib\?% ${CASROOT}/lib/lib%g" libnglib.la
+    chmod a+x libnglib.la
+fi
 
 # to generate environment script for sources
 try_preinstalled