* Added support for htdocs module directory

11 files changed, 4 insertions, 0 deletions

diff --git a/applications/luci-splash/root/www/cgi-bin/luci-splash b/applications/luci-splash/htdocs/cgi-bin/luci-splash
index c75593fbe1..c75593fbe1 100755
--- a/applications/luci-splash/root/www/cgi-bin/luci-splash
+++ b/applications/luci-splash/htdocs/cgi-bin/luci-splash
diff --git a/build/config.mk b/build/config.mk
index 81d3e0836c..3cf13201f5 100644
--- 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 4ef3668c8b..b85dcda359 100644
--- 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
index a3a47aa45b..a3a47aa45b 100644
--- a/libs/cbi/root/www/luci-static/resources/cbi.js
+++ b/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
index aae8591c6a..aae8591c6a 100755
--- a/libs/sgi-haserl/root/www/cgi-bin/index.cgi
+++ b/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
index fd8e5941a5..fd8e5941a5 100755
--- a/libs/sgi-haserl/root/www/cgi-bin/luci
+++ b/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
index 371967ce98..371967ce98 100755
--- a/libs/sgi-haserl/root/www/cgi-bin/luci-upload
+++ b/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
index 39ba558dfb..39ba558dfb 100644
--- a/libs/sgi-haserl/root/www/index.html
+++ b/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
index 8f30015f38..8f30015f38 100644
--- a/themes/fledermaus/root/www/luci-static/fledermaus/cascade.css
+++ b/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
index d4c5dd9a3f..d4c5dd9a3f 100644
--- a/themes/fledermaus/root/www/luci-static/fledermaus/logo.png
+++ b/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
index 90827ab4ed..90827ab4ed 100644
--- a/themes/openwrt.org/root/www/luci-static/openwrt.org/cascade.css
+++ b/themes/openwrt.org/htdocs/luci-static/openwrt.org/cascade.css