[vlc-commits] commit: compilation fix when building a single arch only ( Felix Paul Kühne )

[git at videolan.org]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Mar 21 23:55:23 2010 +0100| [81b4ed0e042693eb474b39510d20fc886c50c920] | committer: Felix Paul Kühne 

compilation fix when building a single arch only

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=81b4ed0e042693eb474b39510d20fc886c50c920
---

 projects/macosx/framework/Pre-Compile.sh |    9 ++++++---
 1 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/projects/macosx/framework/Pre-Compile.sh b/projects/macosx/framework/Pre-Compile.sh
index c045b13..ae0cb38 100644
--- a/projects/macosx/framework/Pre-Compile.sh
+++ b/projects/macosx/framework/Pre-Compile.sh
@@ -119,7 +119,7 @@ vlc_install_object() {
             for linked_lib in `otool -L ${lib_dest}  | grep '(' | sed 's/\((.*)\)//'`; do
                 local name=`basename ${linked_lib}`
                 case "${linked_lib}" in
-                    */vlc_build_dir/* | */vlc_install_dir/* | *vlc* | */extras/contrib/lib/*)
+                    */vlc_build_dir/* | */vlc_install_dir/* | *vlc* | */extras/contrib/*)
                         if test -e ${linked_lib}; then
                             install_name_tool -change "$linked_lib" "${lib_install_prefix}/${name}" "${lib_dest}"
                             linked_libs="${linked_libs} ${ref_lib}"
@@ -269,8 +269,11 @@ popd > /dev/null
 echo "Building share folder..."
 pbxcp="/Developer/Library/PrivateFrameworks/DevToolsCore.framework/Resources/pbxcp -exclude .DS_Store -resolve-src-symlinks"
 mkdir -p ${target_share}
-$pbxcp ${main_build_dir}/share/lua ${target_share}
-
+if test "$use_archs" = "no"; then
+    $pbxcp ${VLC_BUILD_DIR}/share/lua ${target_share}
+else
+    $pbxcp ${main_build_dir}/share/lua ${target_share}
+fi
 
 ##########################
 # Exporting headers