X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=Makefile.am;h=355d8d34ce853e2614fbc8c1b792c281a0f74cb5;hb=ccee49c75601180e6f855383847f70d1caaa4af0;hp=8e97ebcc8b2f47d296ab39629cef49f54984d3ce;hpb=02745c6f42be59383d7ce82f44859261cdc83e86;p=vlc

diff --git a/Makefile.am b/Makefile.am
index 8e97ebcc8b..355d8d34ce 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -48,6 +48,8 @@ EXTRA_DIST = \
 	extras/package/rpm/vlc.altlinux.spec \
 	extras/package/win32/vlc.win32.nsi.in \
 	extras/package/win32/spad.nsi.in \
+	extras/package/win32/UAC.nsh \
+	extras/package/win32/UAC.dll \
 	extras/package/win32/languages/declaration.nsh \
 	extras/package/win32/languages/english.nsh \
 	extras/package/win32/languages/french.nsh
@@ -643,7 +645,7 @@ VLC.app: vlc $(top_builddir)/src/.libs/libvlccore.dylib $(top_builddir)/src/.lib
 	touch $(top_builddir)/VLC.app/Contents/MacOS/VLC
 	chmod +x $(top_builddir)/VLC.app/Contents/MacOS/VLC
 	$(INSTALL) $(top_builddir)/bin/.libs/vlc $(top_builddir)/VLC.app/Contents/MacOS/VLC
-	ln -sf ../../../modules $(top_builddir)/VLC.app/Contents/MacOS/modules
+	ln -sf ../../../modules $(top_builddir)/VLC.app/Contents/MacOS/plugins
 	install -d $(top_builddir)/VLC.app/Contents/MacOS/share
 	for i in `ls $(srcdir)/share`; do \
 	   ln -sf `pwd`/$(srcdir)/share/$$i $(top_builddir)/VLC.app/Contents/MacOS/share/; \
@@ -747,6 +749,11 @@ endif
 		find $(win32_destdir) -type f -name '*.dll' -print | rebase -b 0x70000000 -T -; \
 	fi
 
+# Copy the UAC NSIS plugin
+	mkdir -p "$(win32_destdir)/NSIS"
+	cp "$(top_srcdir)/extras/package/win32/UAC.nsh" "$(win32_destdir)/NSIS"
+	cp "$(top_srcdir)/extras/package/win32/UAC.dll" "$(win32_destdir)/NSIS"
+
 package-win32-xpi: package-win-common-strip
 	mkdir -p "$(win32_xpi_destdir)/plugins"
 	cp $(top_builddir)/projects/mozilla/install.rdf "$(win32_xpi_destdir)"
@@ -789,8 +796,8 @@ if USE_PEFLAGS
 	done
 endif
 
-# Copy the lua scripts (HTTP)
 if BUILD_LUA
+# Copy the lua scripts (HTTP)
 	mkdir -p "$(win32_lua_destdir)/http/images"
 	mkdir -p "$(win32_lua_destdir)/http/requests"
 	mkdir -p "$(win32_lua_destdir)/http/js"
@@ -815,29 +822,19 @@ if BUILD_LUA
 	unix2dos $(win32_lua_destdir)/http/requests/*.xml
 	cp $(srcdir)/share/lua/http/requests/readme $(win32_lua_destdir)/http/requests/readme.txt
 	unix2dos $(win32_lua_destdir)/http/requests/readme.txt
-endif
 
-if BUILD_LUA
 #Lua Scripts
 	$(INSTALL) -d $(win32_lua_destdir)
 	for i in $(srcdir)/share/lua/*.* ; do \
 	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/`basename $${i}` ; \
 	done
-	$(INSTALL) -d $(win32_lua_destdir)/playlist
-	for i in $(srcdir)/share/lua/playlist/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \
+	$(INSTALL) -d $(win32_lua_destdir)/modules
+	for i in $(srcdir)/share/lua/modules/*.* ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/modules/`basename $${i}` ; \
 	done
-	$(INSTALL) -d $(win32_lua_destdir)/sd
-	for i in $(srcdir)/share/lua/sd/*.* ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/sd/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/meta/art
-	for i in $(srcdir)/share/lua/meta/art/*.lua ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/art/`basename $${i}` ; \
-	done
-	$(INSTALL) -d $(win32_lua_destdir)/meta/reader
-	for i in $(srcdir)/share/lua/meta/reader/*.lua ; do \
-	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/reader/`basename $${i}` ; \
+	$(INSTALL) -d $(win32_lua_destdir)/extensions
+	for i in $(srcdir)/share/lua/extensions/*.* ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/extensions/`basename $${i}` ; \
 	done
 	$(INSTALL) -d $(win32_lua_destdir)/intf
 	for i in $(srcdir)/share/lua/intf/*.* ; do \
@@ -847,6 +844,35 @@ if BUILD_LUA
 	for i in $(srcdir)/share/lua/intf/modules/*.* ; do \
 	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/intf/modules/`basename $${i}` ; \
 	done
+	$(INSTALL) -d $(win32_lua_destdir)/meta/art
+	for i in $(srcdir)/share/lua/meta/art/*.* ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/art/`basename $${i}` ; \
+	done
+	$(INSTALL) -d $(win32_lua_destdir)/meta/fetcher
+	for i in $(srcdir)/share/lua/meta/fetcher/*.* ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/fetcher/`basename $${i}` ; \
+	done
+	$(INSTALL) -d $(win32_lua_destdir)/meta/reader
+	for i in $(srcdir)/share/lua/meta/reader/*.* ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/meta/reader/`basename $${i}` ; \
+	done
+	$(INSTALL) -d $(win32_lua_destdir)/playlist
+	for i in $(srcdir)/share/lua/playlist/*.* ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/playlist/`basename $${i}` ; \
+	done
+	$(INSTALL) -d $(win32_lua_destdir)/sd
+	for i in $(srcdir)/share/lua/sd/*.* ; do \
+	  $(INSTALL) -m 644 -- "$${i}" $(win32_lua_destdir)/sd/`basename $${i}` ; \
+	done
+
+	unix2dos $(win32_lua_destdir)/README.txt
+	unix2dos $(win32_lua_destdir)/extensions/README.txt
+	unix2dos $(win32_lua_destdir)/intf/README.txt
+	unix2dos $(win32_lua_destdir)/meta/art/README.txt
+	unix2dos $(win32_lua_destdir)/meta/fetcher/README.txt
+	unix2dos $(win32_lua_destdir)/meta/reader/README.txt
+	unix2dos $(win32_lua_destdir)/playlist/README.txt
+	unix2dos $(win32_lua_destdir)/sd/README.txt
 endif
 
 # Copy the http files