X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=Makefile;h=8ac0ac664ad48c63df18044b081e194d068b9b43;hp=0e09682ae22bc57e6e3e815d039afcb310ff6c8b;hb=12c01f8ae47d99d6486cd9512547b80ceb9e1ff1;hpb=a6fa1e08336e16d487f3c0913ea07a8bb2b345a7

diff --git a/Makefile b/Makefile
index 0e09682ae..8ac0ac664 100644
--- a/Makefile
+++ b/Makefile
@@ -1,15 +1,10 @@
 include build/config.mk
 
-MODULES = applications/* libs/* modules/* themes/* i18n/*
+MODULES = applications/* libs/* modules/* themes/* i18n/* contrib/luaposix
 LUA_TARGET = source
 
-### luaposix merge (temporary) ###
 OS:=$(shell uname)
 export OS
-ifeq ($(OS),Darwin)
-  MODULES += contrib/luaposix
-endif
-
 
 .PHONY: all build gccbuild luabuild clean host gcchost luahost hostcopy hostclean
 
@@ -35,12 +30,27 @@ luahost: luabuild hostcopy
 
 hostcopy: 
 	mkdir -p host
-	for i in $(MODULES); do cp $$i/dist/* host/ -R 2>/dev/null || true; done
+	for i in $(MODULES); do cp -a $$i/dist/* host/ -R 2>/dev/null || true; done
 	rm -f host/luci
-	ln -s .$(LUCI_INSTALLDIR) host/luci
+	ln -s .$(LUCI_MODULEDIR) host/luci
 
-run: host
+runboa: host
+	export LUA_PATH="`pwd`/host$(LUCI_MODULEDIR);;"
+	export LUA_CPATH="`pwd`/host$(LUCI_LIBRARYDIR);;"
+	libs/sgi-webuci/host/buildconfig.sh `pwd`/host  > host/etc/boa/boa.conf
 	./host/usr/bin/boa -c ./host/etc/boa -d
 
+runluci: luahost
+	export LUA_PATH="`pwd`/host$(LUCI_MODULEDIR);;"
+	export LUA_CPATH="`pwd`/host$(LUCI_LIBRARYDIR);;"
+	libs/httpd/host/runluci host$(HTDOCS)
+
 hostclean: clean
 	rm -rf host
+
+run:
+	#	make run is deprecated			#
+	#	Please use:				#
+	#						#
+	#	make runluci to use LuCI HTTPD		#
+	#	make runboa  to use Boa / Webuci	#