Contribs... .la again....

extras/contrib/Makefile

@@ -97,15 +97,14 @@ package-win32: FORCE
 		share/automake* share/gettext* gecko-sdk\
 		| (cd tmp/$(DISTDIR); tar xpf -)
 #kludge for live.com
-	mkdir -p tmp/usr/win32/live.com
+	mkdir -p tmp/$(DISTDIR)/live.com
 	for i in groupsock liveMedia UsageEnvironment BasicUsageEnvironment; do \
 		mkdir -p  tmp/$(DISTDIR)/live.com/$$i/include; \
 		cp -r src/live/$$i/include tmp/$(DISTDIR)/live.com/$$i; \
 		cp src/live/$$i/lib$${i}.a  tmp/$(DISTDIR)/live.com/$$i; \
 	done;
-	./change_prefix.sh tmp $(PREFIX) /$(DISTDIR)
+	./change_prefix.sh tmp $(PREFIX) $(DISTDIR)
 #	Remove unused and potentially harmful files	
-	(cd tmp/$(DISTDIR)/lib; rm -f *.la)
 	(cd tmp/$(DISTDIR)/bin; rm -f *.exe; chmod a+x *)
 
 	(cd tmp; tar cf - $(DISTDIR)) | bzip2 -c > contrib-`date +%Y%m%d`-win32-bin-gcc-`$(CC) --version|head -n 1|cut -f 3 -d ' '`-only.tar.bz2

extras/contrib/change_prefix.sh

@@ -34,7 +34,8 @@ fi
 
 top_dir=`cd $1; pwd`
 prefix=$2
-new_prefix=$3
+new_prefix2=$3
+new_prefix=/$new_prefix2
 
 if test -z $prefix -o -z $new_prefix; then
   echo $usage
@@ -42,11 +43,14 @@ if test -z $prefix -o -z $new_prefix; then
 fi
 
 cd $top_dir
+pwd
 files=`find . -type f`
 for file in $files; do
   if test ".`file $file | grep Mach-O`" != "." ; then
     libs=`otool -L $file 2>/dev/null | grep $prefix | cut -d\  -f 1`
+    echo $libs
     for i in "" $libs; do
+    echo $i
       if ! test -z $i; then
         install_name_tool -change $i \
                           `echo $i | sed -e "s,$prefix,$new_prefix,"` \
@@ -54,11 +58,14 @@ for file in $files; do
       fi
     done
   elif test ".`file $file | grep \"text\|shell\"`" != "." ; then
+
     sed -e "s,$prefix,$new_prefix,g" < $file > $file.tmp
     mv -f $file.tmp $file
   fi
 done
 
+cd $new_prefix2/lib/
+pwd
 files=` ls -1 *.la`
 for file in $files; do
    echo $file