[vlc-devel] commit: VLC.app: Revert to the previous state. (Pierre d'Herbemont )

[git version control]

vlc | branch: master | Pierre d'Herbemont <pdherbemont at videolan.org> | Wed May 28 02:18:47 2008 +0200| [78a0673f05bd5560eb57f5146ca7971efd9a7ca8]

VLC.app: Revert to the previous state.

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.

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

 Makefile.am |    3 ++-
 1 files changed, 2 insertions(+), 1 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f2fd592..b7f9681 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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" ; \