X-Git-Url: https://git.archive.openwrt.org/?p=project%2Fluci.git;a=blobdiff_plain;f=Makefile;h=fa9a407303108e79771325151a829ff21afe718c;hp=ec0d76a621cadd544061d58960e9d334b85c64c9;hb=11a4ce396cd94fae3ebd8f386f28b5968464ae42;hpb=9604acb3bd471b72ed177e224855a4c080933ae8 diff --git a/Makefile b/Makefile index ec0d76a62..fa9a40730 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 @@ -36,7 +31,8 @@ luahost: luabuild hostcopy hostcopy: mkdir -p host for i in $(MODULES); do cp $$i/dist/* host/ -R 2>/dev/null || true; done - ln -sf .$(LUCI_INSTALLDIR) host/luci + rm -f host/luci + ln -s .$(LUCI_INSTALLDIR) host/luci run: host ./host/usr/bin/boa -c ./host/etc/boa -d