Fix HTTP interface not starting at all

diff --git a/Makefile.am b/Makefile.am
index e9256d8688bcdd646b8288373d7da33104d8be5e..5cf08b490737c2750a3ad417f34506be496b34e8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -731,88 +731,88 @@ package-win32-base-debug: package-win-common
 
 # Copy the lua scripts (HTTP)
 if BUILD_LUA
-       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"
-       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/
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/lua/http/images"
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/lua/http/requests"
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/lua/http/js"
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/lua/http/dialogs"
+       cp $(srcdir)/share/lua/http/*.html $(top_builddir)/vlc-$(VERSION)/share/lua/http/
+       unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/*.html
+       cp $(srcdir)/share/lua/http/.hosts $(top_builddir)/vlc-$(VERSION)/share/lua/http/
+       unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/.hosts
+       cp $(srcdir)/share/lua/http/*.css $(top_builddir)/vlc-$(VERSION)/share/lua/http/
+       unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/*.css
+       cp $(srcdir)/share/lua/http/js/*.js $(top_builddir)/vlc-$(VERSION)/share/lua/http/js/
+       unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/js/*.js
+       cp $(srcdir)/share/lua/http/dialogs/* $(top_builddir)/vlc-$(VERSION)/share/lua/http/dialogs/
+       unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/dialogs/*
+       cp $(srcdir)/share/lua/http/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/share/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/*.ico $(top_builddir)/vlc-$(VERSION)/share/lua/http/
+       cp $(srcdir)/share/lua/http/images/*.png $(top_builddir)/vlc-$(VERSION)/share/lua/http/images/
+       cp $(srcdir)/share/lua/http/requests/*.xml $(top_builddir)/vlc-$(VERSION)/share/lua/http/requests/
+       unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/requests/*.xml
+       cp $(srcdir)/share/lua/http/requests/readme $(top_builddir)/vlc-$(VERSION)/share/lua/http/requests/readme.txt
+       unix2dos $(top_builddir)/vlc-$(VERSION)/share/lua/http/requests/readme.txt
 endif
 
 if BUILD_LUA
 #Lua Scripts
-       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/lua/playlist
+       $(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)/lua/playlist/`basename $${i}` ; \
+         $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/playlist/`basename $${i}` ; \
        done
-       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/lua/meta
+       $(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)/lua/meta/`basename $${i}` ; \
+         $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/meta/`basename $${i}` ; \
        done
-       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/lua/intf
+       $(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)/lua/intf/`basename $${i}` ; \
+         $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/intf/`basename $${i}` ; \
        done
-       $(INSTALL) -d $(top_builddir)/vlc-$(VERSION)/lua/intf/modules
+       $(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)/lua/intf/modules/`basename $${i}` ; \
+         $(INSTALL) -m 644 -- "$${i}" $(top_builddir)/vlc-$(VERSION)/share/lua/intf/modules/`basename $${i}` ; \
        done
 endif
 
 # Copy the http files
 if BUILD_HTTPD
-       mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/images"
-       mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/requests"
-       mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/js"
-       mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/dialogs"
-       mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/old"
-       mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/old/vlm"
-       mkdir -p "$(top_builddir)/vlc-$(VERSION)/http/old/admin"
-       cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-$(VERSION)/http/
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http/*.html
-       cp $(srcdir)/share/http/.hosts $(top_builddir)/vlc-$(VERSION)/http/
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http/.hosts
-       cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-$(VERSION)/http/
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http/*.css
-       cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-$(VERSION)/http/js/
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http/js/*.js
-       cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-$(VERSION)/http/dialogs/
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http/dialogs/*
-       cp $(srcdir)/share/http/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/http/dialogs/
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http/dialogs/.hosts
-       cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-$(VERSION)/http/
-       cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-$(VERSION)/http/images/
-       cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-$(VERSION)/http/requests/
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http/requests/*.xml
-       cp $(srcdir)/share/http/requests/readme $(top_builddir)/vlc-$(VERSION)/http/requests/readme.txt
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http/requests/readme.txt
-
-       cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-$(VERSION)/http/old/
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http/old/*.html
-       cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-$(VERSION)/http/old/
-       cp $(srcdir)/share/http/old/.hosts $(top_builddir)/vlc-$(VERSION)/http/old/
-       cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-$(VERSION)/http/old/
-       cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-$(VERSION)/http/old/vlm/
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http/old/vlm/*.html
-       cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-$(VERSION)/http/old/admin/
-       unix2dos $(top_builddir)/vlc-$(VERSION)/http/old/admin/*.html
-       cp $(srcdir)/share/http/old/admin/.access $(top_builddir)/vlc-$(VERSION)/http/old/admin/
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/images"
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/requests"
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/js"
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/dialogs"
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/old"
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/old/vlm"
+       mkdir -p "$(top_builddir)/vlc-$(VERSION)/share/http/old/admin"
+       cp $(srcdir)/share/http/*.html $(top_builddir)/vlc-$(VERSION)/share/http/
+       unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/*.html
+       cp $(srcdir)/share/http/.hosts $(top_builddir)/vlc-$(VERSION)/share/http/
+       unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/.hosts
+       cp $(srcdir)/share/http/*.css $(top_builddir)/vlc-$(VERSION)/share/http/
+       unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/*.css
+       cp $(srcdir)/share/http/js/*.js $(top_builddir)/vlc-$(VERSION)/share/http/js/
+       unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/js/*.js
+       cp $(srcdir)/share/http/dialogs/* $(top_builddir)/vlc-$(VERSION)/share/http/dialogs/
+       unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/dialogs/*
+       cp $(srcdir)/share/http/dialogs/.hosts $(top_builddir)/vlc-$(VERSION)/share/http/dialogs/
+       unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/dialogs/.hosts
+       cp $(srcdir)/share/http/*.ico $(top_builddir)/vlc-$(VERSION)/share/http/
+       cp $(srcdir)/share/http/images/*.png $(top_builddir)/vlc-$(VERSION)/share/http/images/
+       cp $(srcdir)/share/http/requests/*.xml $(top_builddir)/vlc-$(VERSION)/share/http/requests/
+       unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/requests/*.xml
+       cp $(srcdir)/share/http/requests/readme $(top_builddir)/vlc-$(VERSION)/share/http/requests/readme.txt
+       unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/requests/readme.txt
+
+       cp $(srcdir)/share/http/old/*.html $(top_builddir)/vlc-$(VERSION)/share/http/old/
+       unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/old/*.html
+       cp $(srcdir)/share/http/old/*.css $(top_builddir)/vlc-$(VERSION)/share/http/old/
+       cp $(srcdir)/share/http/old/.hosts $(top_builddir)/vlc-$(VERSION)/share/http/old/
+       cp $(srcdir)/share/http/old/*.png $(top_builddir)/vlc-$(VERSION)/share/http/old/
+       cp $(srcdir)/share/http/old/vlm/*.html $(top_builddir)/vlc-$(VERSION)/share/http/old/vlm/
+       unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/old/vlm/*.html
+       cp $(srcdir)/share/http/old/admin/*.html $(top_builddir)/vlc-$(VERSION)/share/http/old/admin/
+       unix2dos $(top_builddir)/vlc-$(VERSION)/share/http/old/admin/*.html
+       cp $(srcdir)/share/http/old/admin/.access $(top_builddir)/vlc-$(VERSION)/share/http/old/admin/
 endif
 
 if BUILD_SKINS