projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge LuCIttpd
[project/luci.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
05f5e91
..
cbebd45
100644
(file)
--- a/
Makefile
+++ b/
Makefile
@@
-1,6
+1,6
@@
include build/config.mk
include build/config.mk
-MODULES =
applications/* libs/* modules/* themes/* i18n/* contrib
/*
+MODULES =
contrib/* applications/* libs/* modules/* themes/* i18n
/*
OS:=$(shell uname)
export OS
OS:=$(shell uname)
export OS
@@
-12,7
+12,7
@@
all: build
build: gccbuild luabuild
gccbuild:
build: gccbuild luabuild
gccbuild:
- for i in $(MODULES); do make -C$$i compile; done
+ for i in $(MODULES); do make -C$$i compile; done
luabuild:
for i in $(MODULES); do make -C$$i luabuild; done
luabuild:
for i in $(MODULES); do make -C$$i luabuild; done
@@
-46,7
+46,7
@@
runboa: hostenv
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host/usr/bin/boa) -c $(realpath host/etc/boa) -d"
runhttpd: hostenv
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath host/usr/bin/boa) -c $(realpath host/etc/boa) -d"
runhttpd: hostenv
- build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath
libs/httpd/host/runluci) $(realpath host) $(HTDOCS)
"
+ build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath
host/usr/bin/lucittpd) $(realpath host)/usr/lib/lucittpd/plugins
"
runluci: luahost
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath libs/httpd/host/runluci) $(realpath host) $(HTDOCS)"
runluci: luahost
build/hostenv.sh $(realpath host) $(LUA_MODULEDIR) $(LUA_LIBRARYDIR) "$(realpath libs/httpd/host/runluci) $(realpath host) $(HTDOCS)"
@@
-71,7
+71,7
@@
run:
# make run is deprecated #
# Please use: #
# #
# make run is deprecated #
# Please use: #
# #
- # To run LuCI WebUI using LuCI
HTTPD
#
+ # To run LuCI WebUI using LuCI
ttpd
#
# make runhttpd #
# #
# To run LuCI WebUI using Boa/Webuci #
# make runhttpd #
# #
# To run LuCI WebUI using Boa/Webuci #