[vlc-devel] commit: macosx: Fix VLC-release.app library links. (VideoLAN )

[git version control]

vlc | branch: master | VideoLAN <videolan at jones.via.ecp.fr> | Tue Apr 15 22:25:48 2008 +0200| [a55cd54a8ef95952fe88852e42448a355af56f7c]

macosx: Fix VLC-release.app library links.

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

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

diff --git a/Makefile.am b/Makefile.am
index 43ce98f..93be1b5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -450,19 +450,7 @@ VLC-release.app: vlc
 	          $(top_builddir)/VLC-release.app; \
 	rm -Rf $(top_builddir)/tmp
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
-	$(INSTALL) $(top_builddir)/src/.libs/vlc \
-		   $(top_builddir)/VLC-release.app/Contents/MacOS/VLC
-	ln -sf ./VLC $(top_builddir)/VLC-release.app/Contents/MacOS/clivlc
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/modules
-	for i in "" `$(VLC_CONFIG) --target plugin` ; do \
-	  if test -n "$$i" ; \
-	    then $(INSTALL) "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
-			   "$(top_builddir)/VLC-release.app/Contents/MacOS/modules" ; \
-	  fi ; done
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/lib ; \
-	  for i in $(srcdir)/src/.libs/*.dylib ; do \
-	    $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \
-	  done ;
+	ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist
 	for i in $(srcdir)/share/lua/playlist/*.* ; do \
 	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist/`basename $${i}` ; \
diff --git a/projects/macosx/framework/Pre-Compile.sh b/projects/macosx/framework/Pre-Compile.sh
index dbce54c..15c3369 100644
--- a/projects/macosx/framework/Pre-Compile.sh
+++ b/projects/macosx/framework/Pre-Compile.sh
@@ -90,8 +90,10 @@ if test "${ACTION}" = "build"; then
     ##########################
     # Hack for VLC-release.app
     if [ "$FULL_PRODUCT_NAME" = "VLC-release.app" ] ; then
-        install_library "${VLC_BUILD_DIR}/${prefix}vlc" "${target}" "bin" "@loader_path/lib"
         prefix=".libs/"
+        install_library "${VLC_BUILD_DIR}/src/${prefix}vlc" "${target}" "bin" "@loader_path/lib"
+        mv ${target}/vlc ${target}/VLC
+        chmod +x ${target}/VLC
     else
         prefix=""
     fi