Blind attempt to fix the OS X builds

More to come as soon as I'm returned from work. Meaning, in 12 hours.

diff --git a/Makefile.am b/Makefile.am
index 162883f49cb7cccf880ab14e5a6274671f851f8c..c67cb6c191403a12c266bf0ab98c20b16010d823 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -642,7 +642,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS
        touch $(top_builddir)/VLC.app/Contents/MacOS/VLC
        chmod +x $(top_builddir)/VLC.app/Contents/MacOS/VLC
-       $(INSTALL) $(top_builddir)/src/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC
+       $(INSTALL) $(top_builddir)/bin/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC
        ln -sf ../../../modules $(top_builddir)/VLC.app/Contents/MacOS/modules
        install -d $(top_builddir)/VLC.app/Contents/MacOS/share
        for i in `ls $(srcdir)/share`; do \

diff --git a/projects/macosx/framework/Pre-Compile.sh b/projects/macosx/framework/Pre-Compile.sh
index 5eb6503f9faf654766d851d9ff621d6cc8e083d8..27dd6c8b5f11682eae3c94283d8f6e1e4b431e99 100644 (file)
--- a/projects/macosx/framework/Pre-Compile.sh
+++ b/projects/macosx/framework/Pre-Compile.sh
@@ -94,7 +94,7 @@ if test "${ACTION}" = "build"; then
     ##########################
     # Hack for VLC-release.app
     if [ "$FULL_PRODUCT_NAME" = "VLC-release.app" ] ; then
-        install_library "${VLC_BUILD_DIR}/src/${prefix}vlc" "${target}" "bin" "@loader_path/lib"
+        install_library "${VLC_BUILD_DIR}/bin/${prefix}vlc" "${target}" "bin" "@loader_path/lib"
         mv ${target}/vlc ${target}/VLC
         chmod +x ${target}/VLC
     elif [ "$FULL_PRODUCT_NAME" = "VLC-release.app" ] ; then