From 8080e1cfbe13503bea8fc7b5933ebd461f787ba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johan=20Bergstr=C3=B6m?= Date: Wed, 20 Mar 2013 22:05:59 +1100 Subject: [PATCH] use `install` as default installer (except on SunOS) --- src/Makefile | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/Makefile b/src/Makefile index f00210fb6..d4551d924 100644 --- a/src/Makefile +++ b/src/Makefile @@ -22,6 +22,10 @@ STD=-std=c99 -pedantic WARN=-Wall OPT=$(OPTIMIZATION) +PREFIX?=/usr/local +INSTALL_BIN=$(PREFIX)/bin +INSTALL=install + # Default allocator ifeq ($(uname_S),Linux) MALLOC=jemalloc @@ -51,6 +55,7 @@ FINAL_LIBS=-lm DEBUG=-g -ggdb ifeq ($(uname_S),SunOS) + INSTALL=cp -pf FINAL_CFLAGS+= -D__EXTENSIONS__ -D_XPG6 FINAL_LIBS+= -ldl -lnsl -lsocket -lpthread else ifeq ($(uname_S),Darwin) @@ -83,10 +88,6 @@ REDIS_CC=$(QUIET_CC)$(CC) $(FINAL_CFLAGS) REDIS_LD=$(QUIET_LINK)$(CC) $(FINAL_LDFLAGS) REDIS_INSTALL=$(QUIET_INSTALL)$(INSTALL) -PREFIX?=/usr/local -INSTALL_BIN=$(PREFIX)/bin -INSTALL=cp -pf - CCCOLOR="\033[34m" LINKCOLOR="\033[34;1m" SRCCOLOR="\033[33m"