[vlc-devel] commit: Blind attempt to fix the OS X builds ( Felix Paul Kühne )

git version control git at videolan.org
Sun Aug 24 11:59:20 CEST 2008


vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Aug 24 12:02:24 2008 +0200| [ec81311ccadb5891ebb5a40ed931a9ef91212cb7] | committer: Felix Paul Kühne 

Blind attempt to fix the OS X builds

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

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

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

diff --git a/Makefile.am b/Makefile.am
index 162883f..c67cb6c 100644
--- 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 5eb6503..27dd6c8 100644
--- 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




More information about the vlc-devel mailing list