Win32: use ShellExecuteW instead of ShellExecuteA in the update code

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 42e94f137d84ce9ee0313a9355ed1c78ab95e690..08ac51d15478966bed4b4335e47969ff506029b0 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -643,7 +643,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/; \
@@ -720,8 +720,7 @@ package-win-common:
        cat $(top_srcdir)/po/LINGUAS | while read i; do \
          mkdir -p "$(win32_destdir)/locale/$${i}/LC_MESSAGES" ; \
          cp "$(srcdir)/po/$${i}.gmo" \
-           "$(win32_destdir)/locale/$${i}/LC_MESSAGES/vlc.mo" \
-            || true ; \
+           "$(win32_destdir)/locale/$${i}/LC_MESSAGES/vlc.mo" || true ; \
        done
        mkdir -p $(win32_destdir)/locale/qt4/
        cp $(QT4LOCALEDIR)/*.qm $(win32_destdir)/locale/qt4/ || true
@@ -739,7 +738,6 @@ if BUILD_ACTIVEX
        cp $(srcdir)/projects/activex/README.TXT  $(win32_destdir)/activex/
        cp $(srcdir)/projects/activex/test.html  $(win32_destdir)/activex/
        unix2dos $(win32_destdir)/activex/*
-
        cp $(top_builddir)/projects/activex/.libs/axvlc$(LIBEXT) $(win32_destdir)/activex/
        cp $(top_srcdir)/projects/activex/axvlc.dll.manifest $(win32_destdir)/activex/
 endif
@@ -791,8 +789,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"
@@ -817,25 +815,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}` ; \
-       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}` ; \
+       $(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)/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 \
@@ -845,6 +837,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