macosx: look for libvlc in lib/ for bundle creation.
authorSebastien Zwickert <dilaroga@free.fr>
Sun, 4 Sep 2011 23:30:11 +0000 (01:30 +0200)
committerFelix Paul Kühne <fkuehne@videolan.org>
Mon, 5 Sep 2011 10:26:41 +0000 (12:26 +0200)
Signed-off-by: Felix Paul Kühne <fkuehne@videolan.org>
Makefile.am
projects/macosx/framework/Pre-Compile.sh

index 669a591..6e47206 100644 (file)
@@ -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
index 2bf6936..b98eca4 100644 (file)
@@ -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}