Fix lua http interface loading.

[vlc] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index d5fa56857c5fb47928cddff699c982c50b56d51b..939a151affc8400db817f8391c4c8b266b59fb3c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -440,39 +440,39 @@ VLC-release.app: vlc
        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
@@ -655,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"