Fixed bugs.

diff --git a/extras/contrib/Makefile b/extras/contrib/Makefile
index 9bef79459f966c48058f961561a85f342df8c38e..dabc1831227ecb67c383273266d7aaaa7d36351f 100644 (file)
--- a/extras/contrib/Makefile
+++ b/extras/contrib/Makefile
@@ -2,7 +2,7 @@
 # Makefile : Build vlc-contrib files
 # ***************************************************************************
 # Copyright (C) 2003 VideoLAN
-# $Id: Makefile,v 1.3 2003/11/23 13:06:43 massiot Exp $
+# $Id: Makefile,v 1.4 2003/11/23 13:23:20 massiot Exp $
 # 
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
 # 
@@ -42,7 +42,7 @@ bin: contrib-macosx.tar.bz2
        mkdir tmp
        bunzip2 -c $< | (cd tmp; tar xf -)
        ./change_prefix.sh tmp @@CONTRIB_PREFIX@@ $(PREFIX)
-       (cd tmp; tar cf -) | tar xf -
+       (cd tmp; tar cf - .) | tar xf -
        rm -rf tmp
 
 clean-src: FORCE

diff --git a/extras/contrib/change_prefix.sh b/extras/contrib/change_prefix.sh
index 176ae85618b20d6db10448742a84b4e6bb5fca74..553be58106548601f92a8f4c7d8c5e8e22310faa 100755 (executable)
--- a/extras/contrib/change_prefix.sh
+++ b/extras/contrib/change_prefix.sh
@@ -3,7 +3,7 @@
 # change_prefix.sh : allow to transfer a contrib dir
 # ***************************************************************************
 # Copyright (C) 2003 VideoLAN
-# $Id: change_prefix.sh,v 1.1 2003/11/23 13:06:43 massiot Exp $
+# $Id: change_prefix.sh,v 1.2 2003/11/23 13:23:20 massiot Exp $
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
 #
@@ -44,14 +44,17 @@ fi
 cd $top_dir
 files=`find . -type f`
 for file in $files; do
-  libs=`otool -L $file 2>/dev/null | grep $prefix | cut -d\  -f 1`
-  for i in "" $libs; do
-    if ! test -z $i; then
-      install_name_tool -change $i \
-                        `echo $i | sed -e "s,$prefix,$new_prefix,"` \
-                        $file
-    fi
-  done
-  sed -e "s,$prefix,$new_prefix,g" < $file > $file.tmp
-  mv -f $file.tmp $file
+  if test ".`file $file | grep Mach-O`" != "." ; then
+    libs=`otool -L $file 2>/dev/null | grep $prefix | cut -d\  -f 1`
+    for i in "" $libs; do
+      if ! test -z $i; then
+        install_name_tool -change $i \
+                          `echo $i | sed -e "s,$prefix,$new_prefix,"` \
+                          $file
+      fi
+    done
+  else
+    sed -e "s,$prefix,$new_prefix,g" < $file > $file.tmp
+    mv -f $file.tmp $file
+  fi
 done