X-Git-Url: https://git.archive.openwrt.org/?a=blobdiff_plain;f=Makefile;h=435d59c599b8f908a4cc179e83ac9598d5e8629d;hb=d8e5e32ad8af6f49a10dc0fe18c9c2327f924dcd;hp=ec0d76a621cadd544061d58960e9d334b85c64c9;hpb=9604acb3bd471b72ed177e224855a4c080933ae8;p=project%2Fluci.git diff --git a/Makefile b/Makefile index ec0d76a62..435d59c59 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,10 +30,12 @@ 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 + 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 run: host + libs/sgi-webuci/host/buildconfig.sh `pwd`/host > host/etc/boa/boa.conf ./host/usr/bin/boa -c ./host/etc/boa -d hostclean: clean