macosx: look for libvlc in lib/ for bundle creation.

Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>

diff --git a/Makefile.am b/Makefile.am
index 669a5910818a86c8cd8395ab8b0c727947c87c97..6e4720663a1d2e0517ce61dc32b8b1e55c8289e5 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -426,6 +426,7 @@ silentstd_0 = 2>&1 >/dev/null
 # use package-macosx to get a nice dmg
 VLC-release.app: vlc
        ( cd src && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd) )
+       ( cd lib && $(MAKE) $(AM_MAKEFLAGS) install $(silentstd) )
        rm -Rf "$(top_builddir)/tmp"
        mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
        rm -Rf $(top_builddir)/VLC-release.app
@@ -554,6 +555,7 @@ VLC-release.app: vlc
 # The resulting VLC.app will only run in this tree.
 VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/lib/.libs/libvlc.dylib
        $(AM_V_GEN)(cd src && make install $(silentstd))
+       $(AM_V_GEN)(cd lib && make install $(silentstd))
        rm -Rf $(top_builddir)/tmp
        mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
        rm -Rf $(top_builddir)/VLC.app

diff --git a/projects/macosx/framework/Pre-Compile.sh b/projects/macosx/framework/Pre-Compile.sh
index 2bf6936b4551b77153140e9b3df7d366e4e36846..b98eca4c1e5bb5a0ac96c9740b085016bfb319a2 100644 (file)
--- a/projects/macosx/framework/Pre-Compile.sh
+++ b/projects/macosx/framework/Pre-Compile.sh
@@ -240,7 +240,7 @@ done
 ##########################
 # Build the lib folder
 
-vlc_install "src/${prefix}" "libvlc.5.dylib" "${target_lib}" "library"
+vlc_install "lib/${prefix}" "libvlc.5.dylib" "${target_lib}" "library"
 vlc_install "src/${prefix}" "libvlccore.5.dylib" "${target_lib}" "library"
 pushd `pwd` > /dev/null
 cd ${target_lib}