diff options
| author | Steven Barth <steven@midlink.org> | 2008-06-14 14:12:12 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2008-06-14 14:12:12 +0000 |
| commit | 855b7582d3576f45693e3a48fdb253c813cf4dce (patch) | |
| tree | b912f63dc43f3b696385083542c801dba8c53976 /build | |
| parent | 50fd29841540bb8b1735291b72853454679e9e62 (diff) | |
* Rewrote Luci to be coroutine-safe allowing the use of non-forking webservers
* Setting base version to 0.7
Diffstat (limited to 'build')
| -rw-r--r-- | build/config.mk | 7 | ||||
| -rw-r--r-- | build/module.mk | 6 |
2 files changed, 10 insertions, 3 deletions
diff --git a/build/config.mk b/build/config.mk index 1755974f2..81d3e0836 100644 --- a/build/config.mk +++ b/build/config.mk @@ -1,4 +1,9 @@ LUAC = luac LUAC_OPTIONS = -s -LUCI_INSTALLDIR = /usr/lib/lua/luci + +LUA_MODULEDIR = /usr/lib/lua +LUA_LIBRARYDIR = /usr/lib/lua + +LUCI_MODULEDIR = $(LUA_MODULEDIR)/luci +LUCI_LIBRARYDIR = $(LUA_LIBRARYDIR)/luci diff --git a/build/module.mk b/build/module.mk index 7fe96cac5..4ef3668c8 100644 --- a/build/module.mk +++ b/build/module.mk @@ -12,9 +12,11 @@ compile: clean: luaclean luasource: - mkdir -p dist$(LUCI_INSTALLDIR) + mkdir -p dist$(LUA_MODULEDIR) + mkdir -p dist$(LUCI_MODULEDIR) cp -a root/* dist -R 2>/dev/null || true - cp -a luasrc/* dist$(LUCI_INSTALLDIR) -R 2>/dev/null || true + cp -a luasrc/* dist$(LUCI_MODULEDIR) -R 2>/dev/null || true + cp -a lua/* dist$(LUA_MODULEDIR) -R 2>/dev/null || true for i in $$(find dist -name .svn); do rm $$i -rf; done luacompile: luasource |