* Added support for htdocs module directory

diff --git a/applications/luci-splash/root/www/cgi-bin/luci-splash b/applications/luci-splash/htdocs/cgi-bin/luci-splash
similarity index 100%
rename from applications/luci-splash/root/www/cgi-bin/luci-splash
rename to applications/luci-splash/htdocs/cgi-bin/luci-splash

diff --git a/build/config.mk b/build/config.mk
index 81d3e0836ca3ed8553b2d8ad17638185f7d64799..3cf13201f516cebc8b95653ef85ee0d4c58d3f71 100644 (file)
--- a/build/config.mk
+++ b/build/config.mk
@@ -7,3 +7,5 @@ LUA_LIBRARYDIR = /usr/lib/lua
 LUCI_MODULEDIR = $(LUA_MODULEDIR)/luci
 LUCI_LIBRARYDIR = $(LUA_LIBRARYDIR)/luci
 
+HTDOCS = /www
+

diff --git a/build/module.mk b/build/module.mk
index 4ef3668c8b04e3f09c2e2a0443c29ee064e924b7..b85dcda359ab7db3591a729bc0c12fe2561cd0c6 100644 (file)
--- a/build/module.mk
+++ b/build/module.mk
@@ -14,9 +14,11 @@ clean: luaclean
 luasource:
        mkdir -p dist$(LUA_MODULEDIR)
        mkdir -p dist$(LUCI_MODULEDIR)
+       mkdir -p dist$(HTDOCS)
        cp -a root/* dist -R 2>/dev/null || true
        cp -a luasrc/* dist$(LUCI_MODULEDIR) -R 2>/dev/null || true
        cp -a lua/* dist$(LUA_MODULEDIR) -R 2>/dev/null || true
+       cp -a htdocs/* dist$(HTDOCS) -R 2>/dev/null || true
        for i in $$(find dist -name .svn); do rm $$i -rf; done  
        
 luacompile: luasource

diff --git a/libs/cbi/root/www/luci-static/resources/cbi.js b/libs/cbi/htdocs/luci-static/resources/cbi.js
similarity index 100%
rename from libs/cbi/root/www/luci-static/resources/cbi.js
rename to libs/cbi/htdocs/luci-static/resources/cbi.js

diff --git a/libs/sgi-haserl/root/www/cgi-bin/index.cgi b/libs/sgi-haserl/htdocs/cgi-bin/index.cgi
similarity index 100%
rename from libs/sgi-haserl/root/www/cgi-bin/index.cgi
rename to libs/sgi-haserl/htdocs/cgi-bin/index.cgi

diff --git a/libs/sgi-haserl/root/www/cgi-bin/luci b/libs/sgi-haserl/htdocs/cgi-bin/luci
similarity index 100%
rename from libs/sgi-haserl/root/www/cgi-bin/luci
rename to libs/sgi-haserl/htdocs/cgi-bin/luci

diff --git a/libs/sgi-haserl/root/www/cgi-bin/luci-upload b/libs/sgi-haserl/htdocs/cgi-bin/luci-upload
similarity index 100%
rename from libs/sgi-haserl/root/www/cgi-bin/luci-upload
rename to libs/sgi-haserl/htdocs/cgi-bin/luci-upload

diff --git a/libs/sgi-haserl/root/www/index.html b/libs/sgi-haserl/htdocs/index.html
similarity index 100%
rename from libs/sgi-haserl/root/www/index.html
rename to libs/sgi-haserl/htdocs/index.html

diff --git a/themes/fledermaus/root/www/luci-static/fledermaus/cascade.css b/themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css
similarity index 100%
rename from themes/fledermaus/root/www/luci-static/fledermaus/cascade.css
rename to themes/fledermaus/htdocs/luci-static/fledermaus/cascade.css

diff --git a/themes/fledermaus/root/www/luci-static/fledermaus/logo.png b/themes/fledermaus/htdocs/luci-static/fledermaus/logo.png
similarity index 100%
rename from themes/fledermaus/root/www/luci-static/fledermaus/logo.png
rename to themes/fledermaus/htdocs/luci-static/fledermaus/logo.png

diff --git a/themes/openwrt.org/root/www/luci-static/openwrt.org/cascade.css b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css
similarity index 100%
rename from themes/openwrt.org/root/www/luci-static/openwrt.org/cascade.css
rename to themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css