Commit 0bc7dbda authored by Johan Bergström's avatar Johan Bergström Committed by antirez
Browse files

use `install` as default installer (except on SunOS)

parent 034d9419
...@@ -22,6 +22,10 @@ STD=-std=c99 -pedantic ...@@ -22,6 +22,10 @@ STD=-std=c99 -pedantic
WARN=-Wall WARN=-Wall
OPT=$(OPTIMIZATION) OPT=$(OPTIMIZATION)
PREFIX?=/usr/local
INSTALL_BIN=$(PREFIX)/bin
INSTALL=install
# Default allocator # Default allocator
ifeq ($(uname_S),Linux) ifeq ($(uname_S),Linux)
MALLOC=jemalloc MALLOC=jemalloc
...@@ -51,6 +55,7 @@ FINAL_LIBS=-lm ...@@ -51,6 +55,7 @@ FINAL_LIBS=-lm
DEBUG=-g -ggdb DEBUG=-g -ggdb
ifeq ($(uname_S),SunOS) ifeq ($(uname_S),SunOS)
INSTALL=cp -pf
FINAL_CFLAGS+= -D__EXTENSIONS__ -D_XPG6 FINAL_CFLAGS+= -D__EXTENSIONS__ -D_XPG6
FINAL_LIBS+= -ldl -lnsl -lsocket -lpthread FINAL_LIBS+= -ldl -lnsl -lsocket -lpthread
else ifeq ($(uname_S),Darwin) else ifeq ($(uname_S),Darwin)
...@@ -83,10 +88,6 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) ...@@ -83,10 +88,6 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS)
REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS)
REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL)
PREFIX?=/usr/local
INSTALL_BIN=$(PREFIX)/bin
INSTALL=cp -pf
CCCOLOR="\033[34m" CCCOLOR="\033[34m"
LINKCOLOR="\033[34;1m" LINKCOLOR="\033[34;1m"
SRCCOLOR="\033[33m" SRCCOLOR="\033[33m"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment