vlc: set the plugin-path explicitly

So we don't need the current working directory hack to run VLC from the
build tree. As an added bonus, we can now run VLC from its build tree
even if the current working directory is not $(top_builddir).

diff --git a/Makefile.am b/Makefile.am
index 4438b68fc5c2982b75de6f2500f5d315b259305b..9e11cb44b6a1042da8b9d775c5fbfe8bb7b23ee1 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -383,14 +383,12 @@ if BUILD_VLC
 noinst_SCRIPTS += vlc$(EXEEXT)
 endif
 
-vlc$(EXEEXT): core
-       rm -f vlc$(EXEEXT)
-       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
+vlc$(EXEEXT): Makefile.am
+       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