Skip to content

Commit 5543978

Browse files
committed
Fix make install
1 parent 4724c7d commit 5543978

File tree

1 file changed

+9
-9
lines changed

1 file changed

+9
-9
lines changed

Makefile

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ REDIS_PID = /redis.pid
1313
REDIS_LOG = /redis.log
1414
REDIS_PREFIX = /tmp/redis-
1515

16-
# Overrideable ledge test variables
16+
# Overrideable redis test variables
1717
TEST_REDIS_PORTS ?= 6379 6380
1818
TEST_REDIS_DATABASE ?= 1
1919

@@ -25,12 +25,12 @@ REDIS_CLI := redis-cli -p $(REDIS_FIRST_PORT) -n $(TES
2525
# (make test TEST_REDIS_SOCKET=/path/to/sock.sock)
2626
TEST_REDIS_SOCKET ?= $(REDIS_PREFIX)$(REDIS_FIRST_PORT)$(REDIS_SOCK)
2727

28-
# Overrideable ledge + sentinel test variables
28+
# Overrideable redis + sentinel test variables
2929
TEST_SENTINEL_PORTS ?= 6381 6382 6383
3030
TEST_SENTINEL_MASTER_NAME ?= mymaster
3131
TEST_SENTINEL_PROMOTION_TIME ?= 20
3232

33-
# Command line arguments for ledge tests
33+
# Command line arguments for redis tests
3434
TEST_REDIS_VARS = PATH=$(OPENRESTY_PREFIX)/nginx/sbin:$(PATH) \
3535
TEST_REDIS_SOCKET=unix://$(TEST_REDIS_SOCKET) \
3636
TEST_REDIS_DATABASE=$(TEST_REDIS_DATABASE) \
@@ -64,17 +64,17 @@ INSTALL ?= install
6464

6565
.PHONY: all install test test_all start_redis_instances stop_redis_instances \
6666
start_redis_instance stop_redis_instance cleanup_redis_instance flush_db \
67-
create_sentinel_config delete_sentinel_config check_ports test_ledge \
67+
create_sentinel_config delete_sentinel_config check_ports test_redis \
6868
test_sentinel
6969

7070
all: ;
7171

7272
install: all
73-
$(INSTALL) -d $(DESTDIR)/$(LUA_LIB_DIR)/ledge
74-
$(INSTALL) lib/ledge/*.lua $(DESTDIR)/$(LUA_LIB_DIR)/ledge
73+
$(INSTALL) -d $(DESTDIR)/$(LUA_LIB_DIR)/resty/redis
74+
$(INSTALL) lib/resty/redis/*.lua $(DESTDIR)/$(LUA_LIB_DIR)/resty/redis
7575

76-
test: test_ledge
77-
test_all: start_redis_instances test_ledge test_sentinel stop_redis_instances
76+
test: test_redis
77+
test_all: start_redis_instances test_redis test_sentinel stop_redis_instances
7878

7979
start_redis_instances: check_ports create_sentinel_config
8080
@$(foreach port,$(TEST_REDIS_PORTS), \
@@ -136,7 +136,7 @@ check_ports:
136136
-@echo "Checking ports $(REDIS_PORTS)"
137137
@$(foreach port,$(REDIS_PORTS),! lsof -i :$(port) &&) true 2>&1 > /dev/null
138138

139-
test_ledge: flush_db
139+
test_redis: flush_db
140140
$(TEST_REDIS_VARS) $(PROVE) $(TEST_FILE)
141141
util/lua-releng
142142

0 commit comments

Comments
 (0)