diff options
| author | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2014-02-12 12:11:28 +0200 |
|---|---|---|
| committer | Kaarle Ritvanen <kaarle.ritvanen@datakunkku.fi> | 2014-02-12 12:11:28 +0200 |
| commit | 3d3f3d4525a823d243d3254a3c03a194ba252394 (patch) | |
| tree | 97038a5bcde3c2bc8f62415467ac61ba76b8af60 | |
| parent | 30bc6fe9292ada8202ef83f81be9959f028ca013 (diff) | |
| download | aconf-3d3f3d4525a823d243d3254a3c03a194ba252394.tar.bz2 aconf-3d3f3d4525a823d243d3254a3c03a194ba252394.tar.xz | |
Makefile: include network and openssh modulesv0.2.3
| -rw-r--r-- | Makefile | 9 | ||||
| -rw-r--r-- | acf2/modules/demo-awall.lua (renamed from acf2/modules/awall.lua) | 0 | ||||
| -rw-r--r-- | acf2/modules/demo-generic.lua (renamed from acf2/modules/generic.lua) | 0 | ||||
| -rw-r--r-- | acf2/modules/network.lua (renamed from acf2/modules/net.lua) | 0 | ||||
| -rw-r--r-- | acf2/modules/openssh.lua (renamed from acf2/modules/sshd.lua) | 0 |
5 files changed, 3 insertions, 6 deletions
@@ -1,4 +1,4 @@ -# Copyright (c) 2012-2013 Kaarle Ritvanen +# Copyright (c) 2012-2014 Kaarle Ritvanen # See LICENSE file for license details ROOT_DIR := / @@ -41,10 +41,7 @@ endef $(eval $(call link,acf2,$(luadir))) -$(eval $(call rcopy,acf2,$(luadir),lua,-not -path 'acf2/modules/*')) - -$(ROOT_DIR)/$(luadir)/modules: - install -d $@ +$(eval $(call rcopy,acf2,$(luadir),lua,-not -path 'acf2/modules/demo-*')) $(eval $(call link,config,$(confdir))) $(eval $(call copy,config,$(confdir),aaa.json,600)) @@ -62,6 +59,6 @@ $(eval $(call copy,web,$(webdir),client.html)) $(eval $(call rcopy,web,$(webdir),js)) -install: $(foreach f,$(files),$(ROOT_DIR)/$(f)) $(ROOT_DIR)/$(luadir)/modules $(ROOT_DIR)/$(starter) +install: $(foreach f,$(files),$(ROOT_DIR)/$(f)) $(ROOT_DIR)/$(starter) .PHONY: all install diff --git a/acf2/modules/awall.lua b/acf2/modules/demo-awall.lua index 45c3674..45c3674 100644 --- a/acf2/modules/awall.lua +++ b/acf2/modules/demo-awall.lua diff --git a/acf2/modules/generic.lua b/acf2/modules/demo-generic.lua index 254add8..254add8 100644 --- a/acf2/modules/generic.lua +++ b/acf2/modules/demo-generic.lua diff --git a/acf2/modules/net.lua b/acf2/modules/network.lua index 32b9d20..32b9d20 100644 --- a/acf2/modules/net.lua +++ b/acf2/modules/network.lua diff --git a/acf2/modules/sshd.lua b/acf2/modules/openssh.lua index 458d2d7..458d2d7 100644 --- a/acf2/modules/sshd.lua +++ b/acf2/modules/openssh.lua |