macosx: Fix VLC-release.app library links.
authorVideoLAN <videolan@jones.via.ecp.fr>
Tue, 15 Apr 2008 20:25:48 +0000 (22:25 +0200)
committerPierre d'Herbemont <pdherbemont@videolan.org>
Tue, 15 Apr 2008 20:31:55 +0000 (22:31 +0200)
Makefile.am
projects/macosx/framework/Pre-Compile.sh

index 43ce98f..93be1b5 100644 (file)
@@ -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}` ; \
index dbce54c..15c3369 100644 (file)
@@ -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