projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* Removed dependency on fastindex due to some bugs
[project/luci.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
ec0d76a
..
fa9a407
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,15
+1,10
@@
include build/config.mk
include build/config.mk
-MODULES = applications/* libs/* modules/* themes/* i18n/*
+MODULES = applications/* libs/* modules/* themes/* i18n/*
contrib/luaposix
LUA_TARGET = source
LUA_TARGET = source
-### luaposix merge (temporary) ###
OS:=$(shell uname)
export OS
OS:=$(shell uname)
export OS
-ifeq ($(OS),Darwin)
- MODULES += contrib/luaposix
-endif
-
.PHONY: all build gccbuild luabuild clean host gcchost luahost hostcopy hostclean
.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
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
run: host
./host/usr/bin/boa -c ./host/etc/boa -d