mirror of
https://github.com/bunkerity/bunkerweb
synced 2026-05-24 09:28:37 +00:00
Merge commit '85f860ffc79f6ef6f744ad595c0de0210de5e3ce' into dev
This commit is contained in:
commit
96dbc4be23
2 changed files with 5 additions and 7 deletions
10
src/deps/src/lua-resty-core/Makefile
vendored
10
src/deps/src/lua-resty-core/Makefile
vendored
|
|
@ -6,8 +6,6 @@ LUA_INCLUDE_DIR ?= $(PREFIX)/include
|
|||
LUA_LIB_DIR ?= $(PREFIX)/lib/lua/$(LUA_VERSION)
|
||||
INSTALL ?= install
|
||||
|
||||
SHELL := /bin/bash
|
||||
|
||||
.PHONY: all test install
|
||||
|
||||
all: ;
|
||||
|
|
@ -22,10 +20,10 @@ install: all
|
|||
$(INSTALL) lib/ngx/ssl/*.lua $(DESTDIR)$(LUA_LIB_DIR)/ngx/ssl/
|
||||
ifeq ($(LUA_LIB_DIR),/usr/local/lib/lua/)
|
||||
@echo
|
||||
@echo -e "\033[33mPLEASE NOTE: \033[0m"
|
||||
@echo -e "\033[33mThe necessary lua_package_path directive needs to be added to nginx.conf\033[0m"
|
||||
@echo -e "\033[33min the http context, because \"/usr/local/lib/lua/\" is not in LuaJIT’s default search path.\033[0m"
|
||||
@echo -e "\033[33mRefer to the Installation section of README.markdown.\033[0m"
|
||||
@printf "\033[33mPLEASE NOTE: \033[0m\n"
|
||||
@printf "\033[33mThe necessary lua_package_path directive needs to be added to nginx.conf\033[0m\n"
|
||||
@printf "\033[33min the http context, because \"/usr/local/lib/lua/\" is not in LuaJIT’s default search path.\033[0m\n"
|
||||
@printf "\033[33mRefer to the Installation section of README.markdown.\033[0m\n"
|
||||
endif
|
||||
|
||||
test: all
|
||||
|
|
|
|||
|
|
@ -141,7 +141,7 @@ local c_buf_type = ffi.typeof("char[?]")
|
|||
local _M = new_tab(0, 18)
|
||||
|
||||
|
||||
_M.version = "0.1.29"
|
||||
_M.version = "0.1.30"
|
||||
_M.new_tab = new_tab
|
||||
_M.clear_tab = clear_tab
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue