diff --git a/Makefile b/Makefile index 294ec3a2..c294ca20 100644 --- a/Makefile +++ b/Makefile @@ -15,7 +15,6 @@ OPM_LIBS = hamishforbes/lua-resty-iputils p0pr0ck5/lua-resty-cookie \ MAKE_LIBS = $(C_LIBS) decode SO_LIBS = libac.so libinjection.so libhtmlentities.so libdecode.so RULES = rules -ROCK_DEPS = "lrexlib-pcre 2.7.2-1" busted luafilesystem LOCAL_LIB_DIR = lib/resty @@ -56,11 +55,6 @@ clean-libs: clean-opm-libs: $(OPM) --install-dir=$(OPM_LIB_DIR) remove $(OPM_LIBS) -clean-rocks: - for ROCK in $(ROCK_DEPS); do \ - $(LUAROCKS) remove $$ROCK; \ - done - clean-test: rm -rf t/servroot* @@ -127,16 +121,11 @@ test-fast: all install-check: stat lib/*.so > /dev/null -install-deps: install-opm-libs install-rocks +install-deps: install-opm-libs install-opm-libs: $(OPM) --install-dir=$(OPM_LIB_DIR) get $(OPM_LIBS) -install-rocks: - for ROCK in $(ROCK_DEPS); do \ - $(LUAROCKS) install $$ROCK; \ - done - install-link: install-check $(INSTALL_SOFT) $(PWD)/lib/resty/* $(LUA_LIB_DIR)/resty/ $(INSTALL_SOFT) $(PWD)/lib/*.so $(LUA_LIB_DIR) diff --git a/lua-resty-waf-0.11.1-1.rockspec b/lua-resty-waf-0.11.1-1.rockspec index 198e7898..71ef6100 100644 --- a/lua-resty-waf-0.11.1-1.rockspec +++ b/lua-resty-waf-0.11.1-1.rockspec @@ -12,8 +12,11 @@ description = { dependencies = { "lua >= 5.1", "luarocks-fetch-gitrec", + "lrexlib-pcre", + "busted", + "luafilesystem", } build = { type = "make", - install_target = "install-hard", + install_target = "install", }