From: Rémi Denis-Courmont <rem@videolan.org>
Date: Mon, 25 Feb 2008 19:52:09 +0000 (+0000)
Subject: Mostly revert [25311], [25313].
X-Git-Tag: 0.9.0-test0~2498
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=a7954388b00c3f2c83bb25d97b75f1a3a470868b;p=vlc

Mostly revert [25311], [25313].
Lets wait for 0.9.1 to sort this out.
---

diff --git a/Makefile.am b/Makefile.am
index 39d32e9fdf..4a06b1e43a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -313,14 +313,16 @@ qvlc: make-alias
 nvlc: make-alias
 	$(MKALIAS) ncurses
 
-noinst_SCRIPTS = vlc
-
-vlc: core
-	rm -f -- vlc vlc.tmp
-	echo '#! /bin/sh' > vlc.tmp
-	echo 'exec "$$(dirname "$$0")/src/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
-	chmod +x vlc.tmp
-	mv -f -- vlc.tmp vlc
+#noinst_SCRIPTS = vlc
+
+vlc$(EXEEXT): core
+	rm -f vlc
+	ln -s src/vlc$(EXEEXT)
+#	rm -f -- vlc vlc.tmp
+#	echo '#! /bin/sh' > vlc.tmp
+#	echo 'exec "$$(dirname "$$0")/src/vlc$(EXEEXT)" "--plugin-path=$$(dirname "$$0")/modules" "$$@"' >> vlc.tmp
+#	chmod +x vlc.tmp
+#	mv -f -- vlc.tmp vlc
 
 if HAVE_DARWIN
 # Create the MacOS X app