[vlc-devel] commit: vlc: set the plugin-path explicitly ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <rem at videolan.org> | Sat May 10 20:45:29 2008 +0300| [492c2c6822d71bf82076188cd21898b3ee2c9981]

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).

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

 Makefile.am |   14 ++++++--------
 1 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 4438b68..9e11cb4 100644
--- 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