X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=Makefile;h=d082a9807706543b1f4a5ecf79594b48ea4dcef9;hp=1b9e25916f913ded884c6f65deb5859f1f96d8f1;hb=90ce9746c230510f690407b7ccc1330bdca48bbd;hpb=7bf803250be75dac62c6e048fa675c93c9093b9a

diff --git a/Makefile b/Makefile
index 1b9e25916..d082a9807 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,12 @@ all: build
 build: gccbuild luabuild
 
 gccbuild:
-	for i in $(MODULES); do make -C$$i compile; done
+	for i in $(MODULES); do \
+		make -C$$i compile || { \
+			echo "*** Compilation of $$i failed!"; \
+			exit 1; \
+		}; \
+	done
 
 luabuild: i18nbuild
 	for i in $(MODULES); do HOST=$(realpath host) make -C$$i luabuild; done
@@ -52,10 +57,11 @@ runboa: hostenv
 runhttpd: hostenv
 	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host/usr/bin/lucittpd) $(realpath host)/usr/lib/lucittpd/plugins"
 
-runluci: runhttpd
+runluci: luahost
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath libs/httpd/host/runluci) $(realpath host) $(HTDOCS)"
 
 runlua: hostenv
-	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) lua
+	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "lua -i build/setup.lua"
 
 runshell: hostenv
 	build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) $$SHELL