Merge branch 'master' of github.com:redis/hiredis

This commit is contained in:
michael-grunder 2018-05-16 09:57:40 -07:00
commit dbde4f68cf

View File

@ -58,7 +58,6 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
ifeq ($(uname_S),SunOS)
REAL_LDFLAGS+= -ldl -lnsl -lsocket
DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
INSTALL= cp -r
endif
ifeq ($(uname_S),Darwin)
DYLIBSUFFIX=dylib
@ -161,11 +160,7 @@ clean:
dep:
$(CC) -MM *.c
ifeq ($(uname_S),$(filter $(uname_S),SunOS OpenBSD))
INSTALL?= cp -r
endif
INSTALL?= cp -a
INSTALL?= cp -pPR
$(PKGCONFNAME): hiredis.h
@echo "Generating $@ for pkgconfig..."