[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [52298] trunk/blender/build_files/ build_environment/install_deps.sh: Install dependencies: dead links should not occur

[Sergey Sharybin]

Revision: 52298
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=52298
Author:   nazgul
Date:     2012-11-17 11:42:37 +0000 (Sat, 17 Nov 2012)
Log Message:
-----------
Install dependencies: dead links should not occur

Modified Paths:
--------------
    trunk/blender/build_files/build_environment/install_deps.sh

Modified: trunk/blender/build_files/build_environment/install_deps.sh
===================================================================
--- trunk/blender/build_files/build_environment/install_deps.sh	2012-11-17 11:35:13 UTC (rev 52297)
+++ trunk/blender/build_files/build_environment/install_deps.sh	2012-11-17 11:42:37 UTC (rev 52298)
@@ -171,12 +171,13 @@
         --enable-loadable-sqlite-extensions --with-dbmliborder=bdb \
         --with-computed-gotos --with-pymalloc
 
-    make -j$THREADS
-    make install
+    make -j$THREADS && make install
     make clean
 
-    rm -f $INST/python-3.3
-    ln -s python-$PYTHON_VERSION $INST/python-3.3
+    if [ -d $_inst ]; then
+      rm -f $INST/python-3.3
+      ln -s python-$PYTHON_VERSION $INST/python-3.3
+    fi
 
     magic_compile_set python-$PYTHON_VERSION $py_magic
 
@@ -220,8 +221,10 @@
          --prefix=$_inst --disable-icu boost.locale.icu=off install
     ./b2 --clean
 
-    rm -f $INST/boost
-    ln -s boost-$BOOST_VERSION $INST/boost
+    if [ -d $_inst ]; then
+      rm -f $INST/boost
+      ln -s boost-$BOOST_VERSION $INST/boost
+    fi
 
     magic_compile_set boost-$BOOST_VERSION $boost_magic
 
@@ -281,8 +284,7 @@
           -D CMAKE_EXE_LINKER_FLAGS="-lgcc_s -lgcc" \
           ..
 
-    make -j$THREADS
-    make install
+    make -j$THREADS && make install
 
     # Force linking against static libs
     rm -f $_inst/lib/*.so*
@@ -293,8 +295,10 @@
 
     make clean
 
-    rm -f $INST/ocio
-    ln -s ocio-$OCIO_VERSION $INST/ocio
+    if [ -d $_inst ]; then
+      rm -f $INST/ocio
+      ln -s ocio-$OCIO_VERSION $INST/ocio
+    fi
 
     magic_compile_set ocio-$OCIO_VERSION $ocio_magic
 
@@ -361,12 +365,13 @@
 
     cmake $cmake_d -D CMAKE_CXX_FLAGS="$cflags" -D CMAKE_EXE_LINKER_FLAGS="-lgcc_s -lgcc" ../src
 
-    make -j$THREADS
-    make install
+    make -j$THREADS && make install
     make clean
 
-    rm -f $INST/oiio
-    ln -s oiio-$OIIO_VERSION $INST/oiio
+    if [ -d $_inst ]; then
+      rm -f $INST/oiio
+      ln -s oiio-$OIIO_VERSION $INST/oiio
+    fi
 
     magic_compile_set oiio-$OIIO_VERSION $oiio_magic
 
@@ -434,12 +439,13 @@
 
     cmake $cmake_d ../src
 
-    make -j$THREADS
-    make install
+    make -j$THREADS && make install
     make clean
 
-    rm -f $INST/osl
-    ln -s osl-$OSL_VERSION $INST/osl
+    if [ -d $_inst ]; then
+      rm -f $INST/osl
+      ln -s osl-$OSL_VERSION $INST/osl
+    fi
 
     magic_compile_set osl-$OSL_VERSION $osl_magic
 
@@ -522,12 +528,13 @@
         --disable-outdev=alsa --disable-indev=sdl --disable-indev=alsa --disable-indev=jack \
         --disable-indev=lavfi $extra
 
-    make -j$THREADS
-    make install
+    make -j$THREADS && make install
     make clean
 
-    rm -f $INST/ffmpeg
-    ln -s ffmpeg-$FFMPEG_VERSION $INST/ffmpeg
+    if [ -d $_inst ]; then
+      rm -f $INST/ffmpeg
+      ln -s ffmpeg-$FFMPEG_VERSION $INST/ffmpeg
+    fi
 
     magic_compile_set ffmpeg-$FFMPEG_VERSION $ffmpeg_magic