--- a/makefile.~1~ 2017-09-28 18:11:35.000000000 +0200 +++ b/makefile 2018-04-10 20:45:58.307407705 +0200 @@ -3,7 +3,7 @@ -TMP := tmp +TMP := ${T} BUILD_DIR := ${TMP}/redis-${REDIS_BRANCH} TARBALL := ${TMP}/redis-${REDIS_BRANCH}.tar.gz -BINARY := ${BUILD_DIR}/src/redis-server +BINARY := /usr/sbin/redis-server -PID_PATH := ${BUILD_DIR}/redis.pid +PID_PATH := ${TMP}/redis.pid -SOCKET_PATH := ${BUILD_DIR}/redis.sock +SOCKET_PATH := ${TMP}/redis.sock PORT := 6381 @@ -11,7 +11,7 @@ test: ${TEST_FILES} make start env SOCKET_PATH=${SOCKET_PATH} \ - ruby -v $$(echo $? | tr ' ' '\n' | awk '{ print "-r./" $$0 }') -e '' + ${RUBY} -v $$(echo $? | tr ' ' '\n' | awk '{ print "-r./" $$0 }') -e '' make stop ${TMP}: @@ -20,11 +20,11 @@ ${TARBALL}: ${TMP} wget https://github.com/antirez/redis/archive/${REDIS_BRANCH}.tar.gz -O $@ -${BINARY}: ${TARBALL} ${TMP} - rm -rf ${BUILD_DIR} - mkdir -p ${BUILD_DIR} - tar xf ${TARBALL} -C ${TMP} - cd ${BUILD_DIR} && make +# ${BINARY}: ${TARBALL} ${TMP} +# rm -rf ${BUILD_DIR} +# mkdir -p ${BUILD_DIR} +# tar xf ${TARBALL} -C ${TMP} +# cd ${BUILD_DIR} && make stop: (test -f ${PID_PATH} && (kill $$(cat ${PID_PATH}) || true) && rm -f ${PID_PATH}) || true