Commit 0038d622 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

Bring a non-installed ./vlc script that loads plugins from the build tree explicitly.

parent 7e436fa9
...@@ -245,9 +245,10 @@ DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ...@@ -245,9 +245,10 @@ DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
# Don't use it if you don't know what it is about. # Don't use it if you don't know what it is about.
# Don't complain if it doesn't work. -- Courmisch # Don't complain if it doesn't work. -- Courmisch
libvlc: libvlc:
cd src && $(MAKE) $(AM_MAKEFLAGS) src/libvlc.la cd src && $(MAKE) $(AM_MAKEFLAGS) libvlc.la
core: libvlc vlc$(EXEEXT) core:
cd src && $(MAKE) $(AM_MAKEFLAGS) vlc
.PHONY: libvlc core .PHONY: libvlc core
...@@ -312,6 +313,15 @@ qvlc: make-alias ...@@ -312,6 +313,15 @@ qvlc: make-alias
nvlc: make-alias nvlc: make-alias
$(MKALIAS) ncurses $(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
if HAVE_DARWIN if HAVE_DARWIN
# Create the MacOS X app # Create the MacOS X app
noinst_DATA = VLC.app noinst_DATA = VLC.app
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment