Mostly revert [25311], [25313].

Lets wait for 0.9.1 to sort this out.

diff --git a/Makefile.am b/Makefile.am
index 39d32e9fdfe656afdedb6f076a18a2be71c253b4..4a06b1e43a9fd497159ddf65f56d859071a6f1db 100644 (file)
--- 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