[vlc-commits] macosx: look for libvlc in lib/ for bundle creation.

[Sebastien Zwickert]

vlc | branch: master | Sebastien Zwickert <dilaroga at free.fr> | Mon Sep  5 01:30:11 2011 +0200| [52a381c9f23ca290f5b6af4ac11893712a722d2a] | committer: Felix Paul Kühne

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

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

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=52a381c9f23ca290f5b6af4ac11893712a722d2a
---

 Makefile.am                              |    2 ++
 projects/macosx/framework/Pre-Compile.sh |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 669a591..6e47206 100644
--- 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 2bf6936..b98eca4 100644
--- 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}