]> git.sesse.net Git - vlc/commitdiff
VLC.app: Revert to the previous state.
authorPierre d'Herbemont <pdherbemont@videolan.org>
Wed, 28 May 2008 00:18:47 +0000 (02:18 +0200)
committerPierre d'Herbemont <pdherbemont@videolan.org>
Wed, 28 May 2008 00:18:47 +0000 (02:18 +0200)
Mac OS X doesn't like much the fact that we place a script that launch an other executable. We end up in having no Dock connection. That would require some tweaking on our side that is not pretty.

Makefile.am

index f2fd592de33332b4aa89942b72d0d543c471be50..b7f9681ed8b2462b2d67de0b950acb85fe20da48 100644 (file)
@@ -554,6 +554,7 @@ VLC-release.app: vlc
 # This is just for development purposes. 
 # The resulting VLC.app will only in this tree.
 VLC.app: vlc 
+       (cd src && make install)
        rm -Rf $(top_builddir)/tmp
        mkdir -p "$(top_builddir)/tmp/extras/package/macosx"
        rm -Rf $(top_builddir)/VLC.app
@@ -626,7 +627,7 @@ VLC.app: vlc
        $(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
-       echo "#! /bin/sh\nexec \"\$$(dirname \"\$$0\")/../../../src/vlc\" \"--plugin-path=\$$(dirname \"\$$0\")/../../../modules\" \"\$$@\"" > $(top_builddir)/VLC.app/Contents/MacOS/VLC
+       $(INSTALL) $(top_builddir)/src/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC
        $(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/modules
        find modules/ -name '*_plugin$(LIBEXT)' | while read i; do \
          if test -n "$$i" ; \