diff --git a/makefile b/makefile index c803066..d50ee93 100644 --- a/makefile +++ b/makefile @@ -1,16 +1,15 @@ REDIS_BRANCH ?= 6.2 -TMP := tmp BUILD_DIR := ${TMP}/cache/redis-${REDIS_BRANCH} TARBALL := ${TMP}/redis-${REDIS_BRANCH}.tar.gz -BINARY := ${BUILD_DIR}/src/redis-server -REDIS_CLIENT := ${BUILD_DIR}/src/redis-cli +BINARY := /usr/sbin/redis-server +REDIS_CLIENT := /usr/bin/redis-cli REDIS_TRIB := ${BUILD_DIR}/src/redis-trib.rb -PID_PATH := ${BUILD_DIR}/redis.pid -SOCKET_PATH := ${BUILD_DIR}/redis.sock +PID_PATH := ${TMP}/redis.pid +SOCKET_PATH := ${TMP}/redis.sock PORT := 6381 SLAVE_PORT := 6382 -SLAVE_PID_PATH := ${BUILD_DIR}/redis_slave.pid -SLAVE_SOCKET_PATH := ${BUILD_DIR}/redis_slave.sock +SLAVE_PID_PATH := ${TMP}/redis_slave.pid +SLAVE_SOCKET_PATH := ${TMP}/redis_slave.sock HA_GROUP_NAME := master1 SENTINEL_PORTS := 6400 6401 6402 SENTINEL_PID_PATHS := $(addprefix ${TMP}/redis,$(addsuffix .pid,${SENTINEL_PORTS})) @@ -32,11 +31,11 @@ stop_all: stop_sentinel stop_slave stop stop_cluster ${TMP}: @mkdir -p $@ -${BINARY}: ${TMP} - @bin/build ${REDIS_BRANCH} $< +#${BINARY}: ${TMP} +# @bin/build ${REDIS_BRANCH} $< test: - @env SOCKET_PATH=${SOCKET_PATH} bundle exec rake test + @env SOCKET_PATH=${SOCKET_PATH} ${RUBY} -S rake test stop: @$(call kill-redis,${PID_PATH})