projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
libs/web: Removed deprecated i18n-file naming convention
[project/luci.git]
/
Makefile
diff --git
a/Makefile
b/Makefile
index
0e09682
..
8ac0ac6
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
@@
-35,12
+30,27
@@
luahost: luabuild hostcopy
hostcopy:
mkdir -p host
hostcopy:
mkdir -p host
- for i in $(MODULES); do cp $$i/dist/* host/ -R 2>/dev/null || true; done
+ for i in $(MODULES); do cp
-a
$$i/dist/* host/ -R 2>/dev/null || true; done
rm -f host/luci
rm -f host/luci
- ln -s .$(LUCI_
INSTALL
DIR) host/luci
+ ln -s .$(LUCI_
MODULE
DIR) host/luci
-run: host
+runboa: host
+ export LUA_PATH="`pwd`/host$(LUCI_MODULEDIR);;"
+ export LUA_CPATH="`pwd`/host$(LUCI_LIBRARYDIR);;"
+ libs/sgi-webuci/host/buildconfig.sh `pwd`/host > host/etc/boa/boa.conf
./host/usr/bin/boa -c ./host/etc/boa -d
./host/usr/bin/boa -c ./host/etc/boa -d
+runluci: luahost
+ export LUA_PATH="`pwd`/host$(LUCI_MODULEDIR);;"
+ export LUA_CPATH="`pwd`/host$(LUCI_LIBRARYDIR);;"
+ libs/httpd/host/runluci host$(HTDOCS)
+
hostclean: clean
rm -rf host
hostclean: clean
rm -rf host
+
+run:
+ # make run is deprecated #
+ # Please use: #
+ # #
+ # make runluci to use LuCI HTTPD #
+ # make runboa to use Boa / Webuci #