X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=939a151affc8400db817f8391c4c8b266b59fb3c;hb=f8f7d6a15f26b0151999df949a20c6213a50b6b2;hp=6b4f63c415de18424268891023354ed2bd499950;hpb=c3f5005864fd850107e6b225a05cfd5e82119061;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 6b4f63c415..939a151aff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,7 +38,8 @@ BUILT_SOURCES = $(BUILT_SOURCES_distclean) $(BUILT_SOURCES_clean)
 SUFFIXES = 
 
 DISTCHECK_CONFIGURE_FLAGS = --disable-dvd --disable-mad --disable-libmpeg2 \
-	--disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2
+	--disable-ffmpeg --disable-faad --disable-wxwidgets --disable-skins2 \
+	--disable-fribidi
 
 ACLOCAL_AMFLAGS = -I m4
 AUTOMAKE_OPTIONS = \
@@ -49,6 +50,10 @@ AUTOMAKE_OPTIONS = \
 	no-dist-gzip
 #	std-options
 
+ChangeLog: Makefile.am
+	rm -f -- "$@"
+	ln -sf doc/ChangeLog-2008 "$@"
+
 ###############################################################################
 # MacOS X project
 ###############################################################################
@@ -217,7 +222,6 @@ EXTRA_DIST += \
 	extras/analyser/vlc.vim \
 	extras/analyser/valgrind.suppressions \
 	extras/buildsystem/make.pl \
-	extras/buildsystem/autotools/m4/autoconf260.m4 \
 	extras/misc/mpris.py \
 	extras/misc/mpris.glade
 
@@ -239,7 +243,7 @@ vlc-config.in: vlc-config.in.in
 	touch $@
 
 CLEANFILES = $(BUILT_SOURCES_clean) stamp-builtin
-DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile
+DISTCLEANFILES = $(BUILT_SOURCES_distclean) vlc-config.in compile ChangeLog
 
 # Shortcut for developpers to rebuild the core (libvlc + vlc)
 # Don't use it if you don't know what it is about.
@@ -289,7 +293,9 @@ endif
 ALL_ALIASES = cvlc rvlc svlc wxvlc qvlc nvlc
 bin_SCRIPTS += $(ALIASES)
 CLEANFILES += $(ALIASES)
+if BUILD_VLC
 EXTRA_SCRIPTS = $(ALL_ALIASES)
+endif
 
 dist_noinst_SCRIPTS += make-alias
 
@@ -313,10 +319,12 @@ qvlc: make-alias
 nvlc: make-alias
 	$(MKALIAS) ncurses
 
-#noinst_SCRIPTS = vlc
+if BUILD_VLC
+noinst_SCRIPTS = vlc$(EXEEXT)
+endif
 
 vlc$(EXEEXT): core
-	rm -f vlc
+	rm -f vlc$(EXEEXT)
 	ln -s src/vlc$(EXEEXT)
 #	rm -f -- vlc vlc.tmp
 #	echo '#! /bin/sh' > vlc.tmp
@@ -326,8 +334,11 @@ vlc$(EXEEXT): core
 
 if HAVE_DARWIN
 # Create the MacOS X app
+if BUILD_VLC
 noinst_DATA = VLC.app
-# VLC-release.app is the old VLC.app target
+endif
+# VLC-release.app for packaging and giving it to your friends
+# use package-macosx to get a nice dmg
 VLC-release.app: vlc
 	( cd src && make install )
 	rm -Rf "$(top_builddir)/tmp"
@@ -400,56 +411,68 @@ VLC-release.app: vlc
 	          $(top_builddir)/VLC-release.app; \
 	rm -Rf $(top_builddir)/tmp
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS
-	ACTION="VLC-release.app" src_dir=$(srcdir) build_dir=$(top_builddir) sh $(srcdir)/projects/macosx/framework/Pre-Compile.sh
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist
-	for i in $(srcdir)/share/luaplaylist/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaplaylist/`basename $${i}` ; \
+	$(INSTALL) $(top_builddir)/src/.libs/vlc \
+		   $(top_builddir)/VLC-release.app/Contents/MacOS/VLC
+	ln -sf ./VLC $(top_builddir)/VLC-release.app/Contents/MacOS/clivlc
+	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/modules
+	for i in "" `$(VLC_CONFIG) --target plugin` ; do \
+	  if test -n "$$i" ; \
+	    then $(INSTALL) "`pwd`/`dirname $$i`/.libs/`basename $$i`$(LIBEXT)" \
+			   "$(top_builddir)/VLC-release.app/Contents/MacOS/modules" ; \
+	  fi ; done
+	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/lib ; \
+	  for i in $(srcdir)/src/.libs/*.dylib ; do \
+	    $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/lib/`basename $${i}` ; \
+	  done ;
+	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist
+	for i in $(srcdir)/share/lua/playlist/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/playlist/`basename $${i}` ; \
 	done ; \
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta
-	for i in $(srcdir)/share/luameta/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luameta/`basename $${i}` ; \
+	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/meta
+	for i in $(srcdir)/share/lua/meta/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/meta/`basename $${i}` ; \
 	done ; \
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf
-	for i in $(srcdir)/share/luaintf/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/`basename $${i}` ; \
+	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf
+	for i in $(srcdir)/share/lua/intf/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/`basename $${i}` ; \
 	done ; \
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/modules
-	for i in $(srcdir)/share/luaintf/modules/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/luaintf/modules/`basename $${i}` ; \
+	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/modules
+	for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/intf/modules/`basename $${i}` ; \
 	done ; \
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/admin
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images
-	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests
-	$(INSTALL) -m 644 $(srcdir)/share/http-lua/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/.hosts
-	for i in $(srcdir)/share/http-lua/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/`basename $${i}` ; \
+	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/dialogs
+	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/js
+	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/old
+	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/old/admin
+	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/old/vlm
+	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/images
+	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests
+	$(INSTALL) -m 644 $(srcdir)/share/lua/http/.hosts $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/.hosts
+	for i in $(srcdir)/share/lua/http/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/`basename $${i}` ; \
 	done
-	for i in $(srcdir)/share/http-lua/dialogs/* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/dialogs/`basename $${i}` ; \
+	for i in $(srcdir)/share/lua/http/dialogs/* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/dialogs/`basename $${i}` ; \
 	done
-	for i in $(srcdir)/share/http-lua/js/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/js/`basename $${i}` ; \
+	for i in $(srcdir)/share/lua/http/js/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/js/`basename $${i}` ; \
 	done
-	for i in $(srcdir)/share/http-lua/old/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/`basename $${i}` ; \
+	for i in $(srcdir)/share/lua/http/old/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/old/`basename $${i}` ; \
 	done
-	for i in $(srcdir)/share/http-lua/old/admin/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/admin/`basename $${i}` ; \
+	for i in $(srcdir)/share/lua/http/old/admin/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/old/admin/`basename $${i}` ; \
 	done
-	for i in $(srcdir)/share/http-lua/old/vlm/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/old/vlm/`basename $${i}` ; \
+	for i in $(srcdir)/share/lua/http/old/vlm/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/old/vlm/`basename $${i}` ; \
 	done
-	for i in $(srcdir)/share/http-lua/images/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/images/`basename $${i}` ; \
+	for i in $(srcdir)/share/lua/http/images/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/images/`basename $${i}` ; \
 	done
-	for i in $(srcdir)/share/http-lua/requests/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/`basename $${i}` ; \
+	for i in $(srcdir)/share/lua/http/requests/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/`basename $${i}` ; \
 	done
-	$(INSTALL) -m 644 $(srcdir)/share/http-lua/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/http-lua/requests/readme.txt
+	$(INSTALL) -m 644 $(srcdir)/share/lua/http/requests/readme $(top_builddir)/VLC-release.app/Contents/MacOS/share/lua/http/requests/readme.txt
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/dialogs
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/js
 	$(INSTALL) -d $(top_builddir)/VLC-release.app/Contents/MacOS/share/http/old
@@ -498,6 +521,8 @@ VLC-release.app: vlc
 	find $(top_builddir)/VLC-release.app -type d -exec chmod ugo+rx '{}' \;
 	find $(top_builddir)/VLC-release.app -type f -exec chmod ugo+r '{}' \;
 
+# This is just for development purposes. 
+# The resulting VLC.app will only in this tree.
 VLC.app: vlc 
 	( cd src && make install )
 	rm -Rf $(top_builddir)/tmp
@@ -619,8 +644,8 @@ package-win-common:
 	for file in AUTHORS MAINTAINERS THANKS ; \
 	  do sed 's/@/_AT_/' < "$(srcdir)/$$file" > "$(top_builddir)/vlc-$(VERSION)/$${file}.txt" ; done;
 	for file in NEWS COPYING README; \
-	   do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done
-	  unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt
+	  do cp "$(srcdir)/$$file" "$(top_builddir)/vlc-$(VERSION)/$${file}.txt"; done
+	unix2dos "$(top_builddir)/vlc-$(VERSION)/"*.txt
 
 	mkdir $(top_builddir)/vlc-$(VERSION)/locale
 	cat $(top_srcdir)/po/LINGUAS | while read i; do \
@@ -630,42 +655,42 @@ package-win-common:
             || true ; \
 	done
 
-	mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/images"
-	mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/requests"
-	mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/js"
-	mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/dialogs"
-	mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/old"
-	mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/old/vlm"
-	mkdir -p "$(top_builddir)/vlc-$(VERSION)/http-lua/old/admin"
-	cp $(srcdir)/share/http-lua/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/*.html ;
-	cp $(srcdir)/share/http-lua/.hosts $(top_builddir)/vlc-$(VERSION)/http-lua/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/.hosts ;
-	cp $(srcdir)/share/http-lua/*.css $(top_builddir)/vlc-$(VERSION)/http-lua/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/*.css ;
-	cp $(srcdir)/share/http-lua/js/*.js $(top_builddir)/vlc-$(VERSION)/http-lua/js/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/js/*.js ;
-	cp $(srcdir)/share/http-lua/dialogs/* $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/* ;
-	cp $(srcdir)/share/http-lua/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/dialogs/.hosts ;
-	cp $(srcdir)/share/http-lua/*.ico $(top_builddir)/vlc-$(VERSION)/http-lua/ ;
-	cp $(srcdir)/share/http-lua/images/*.png $(top_builddir)/vlc-$(VERSION)/http-lua/images/
-	cp $(srcdir)/share/http-lua/requests/*.xml $(top_builddir)/vlc-$(VERSION)/http-lua/requests/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/requests/*.xml ;
-	cp $(srcdir)/share/http-lua/requests/readme $(top_builddir)/vlc-$(VERSION)/http-lua/requests/readme.txt ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/requests/readme.txt ;
-
-	cp $(srcdir)/share/http-lua/old/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/old/*.html ;
-	cp $(srcdir)/share/http-lua/old/*.css $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ;
-	cp $(srcdir)/share/http-lua/old/.hosts $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ;
-	cp $(srcdir)/share/http-lua/old/*.png $(top_builddir)/vlc-$(VERSION)/http-lua/old/ ;
-	cp $(srcdir)/share/http-lua/old/vlm/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/old/vlm/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/old/vlm/*.html ;
-	cp $(srcdir)/share/http-lua/old/admin/*.html $(top_builddir)/vlc-$(VERSION)/http-lua/old/admin/ ;
-	unix2dos $(top_builddir)/vlc-$(VERSION)/http-lua/old/admin/*.html ;
-	cp $(srcdir)/share/http-lua/old/admin/.access $(top_builddir)/vlc-$(VERSION)/http-lua/old/admin/ ;
+	mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/images"
+	mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/requests"
+	mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/js"
+	mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/dialogs"
+	mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/old"
+	mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/old/vlm"
+	mkdir -p "$(top_builddir)/vlc-$(VERSION)/lua/http/old/admin"
+	cp $(srcdir)/share/lua/http/*.html $(top_builddir)/vlc-$(VERSION)/lua/http/ ;
+	unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/*.html ;
+	cp $(srcdir)/share/lua/http/.hosts $(top_builddir)/vlc-$(VERSION)/lua/http/ ;
+	unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/.hosts ;
+	cp $(srcdir)/share/lua/http/*.css $(top_builddir)/vlc-$(VERSION)/lua/http/ ;
+	unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/*.css ;
+	cp $(srcdir)/share/lua/http/js/*.js $(top_builddir)/vlc-$(VERSION)/lua/http/js/ ;
+	unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/js/*.js ;
+	cp $(srcdir)/share/lua/http/dialogs/* $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/ ;
+	unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/* ;
+	cp $(srcdir)/share/lua/http/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/ ;
+	unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/dialogs/.hosts ;
+	cp $(srcdir)/share/lua/http/*.ico $(top_builddir)/vlc-$(VERSION)/lua/http/ ;
+	cp $(srcdir)/share/lua/http/images/*.png $(top_builddir)/vlc-$(VERSION)/lua/http/images/
+	cp $(srcdir)/share/lua/http/requests/*.xml $(top_builddir)/vlc-$(VERSION)/lua/http/requests/ ;
+	unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/requests/*.xml ;
+	cp $(srcdir)/share/lua/http/requests/readme $(top_builddir)/vlc-$(VERSION)/lua/http/requests/readme.txt ;
+	unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/requests/readme.txt ;
+
+	cp $(srcdir)/share/lua/http/old/*.html $(top_builddir)/vlc-$(VERSION)/lua/http/old/ ;
+	unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/old/*.html ;
+	cp $(srcdir)/share/lua/http/old/*.css $(top_builddir)/vlc-$(VERSION)/lua/http/old/ ;
+	cp $(srcdir)/share/lua/http/old/.hosts $(top_builddir)/vlc-$(VERSION)/lua/http/old/ ;
+	cp $(srcdir)/share/lua/http/old/*.png $(top_builddir)/vlc-$(VERSION)/lua/http/old/ ;
+	cp $(srcdir)/share/lua/http/old/vlm/*.html $(top_builddir)/vlc-$(VERSION)/lua/http/old/vlm/ ;
+	unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/old/vlm/*.html ;
+	cp $(srcdir)/share/lua/http/old/admin/*.html $(top_builddir)/vlc-$(VERSION)/lua/http/old/admin/ ;
+	unix2dos $(top_builddir)/vlc-$(VERSION)/lua/http/old/admin/*.html ;
+	cp $(srcdir)/share/lua/http/old/admin/.access $(top_builddir)/vlc-$(VERSION)/lua/http/old/admin/ ;
 
 	mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/images"
 	mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/requests"
@@ -754,21 +779,21 @@ package-win32-base-debug: package-win-common
 	  cp $$i $(top_builddir)/vlc-$(VERSION)/skins/ || true ; \
 	done
 
-	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luaplaylist
-	for i in $(srcdir)/share/luaplaylist/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaplaylist/`basename $${i}` ; \
+	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/playlist
+	for i in $(srcdir)/share/lua/playlist/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/playlist/`basename $${i}` ; \
 	done ;
-	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luameta
-	for i in $(srcdir)/share/luameta/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luameta/`basename $${i}` ; \
+	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/meta
+	for i in $(srcdir)/share/lua/meta/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/meta/`basename $${i}` ; \
 	done ;
-	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luaintf
-	for i in $(srcdir)/share/luaintf/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaintf/`basename $${i}` ; \
+	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf
+	for i in $(srcdir)/share/lua/intf/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/intf/`basename $${i}` ; \
 	done ;
-	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/luaintf/modules
-	for i in $(srcdir)/share/luaintf/modules/*.* ; do \
-	  $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/luaintf/modules/`basename $${i}` ; \
+	$(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules
+	for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
+	  $(INSTALL) -m 644 $${i} $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules/`basename $${i}` ; \
 	done ;
 
 	mkdir -p "$(top_builddir)/vlc-$(VERSION)/osdmenu"