Merge branch 'master' of github.com:redis/hiredis
This commit is contained in:
commit
dbde4f68cf
7
Makefile
7
Makefile
@ -58,7 +58,6 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
|
|||||||
ifeq ($(uname_S),SunOS)
|
ifeq ($(uname_S),SunOS)
|
||||||
REAL_LDFLAGS+= -ldl -lnsl -lsocket
|
REAL_LDFLAGS+= -ldl -lnsl -lsocket
|
||||||
DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
|
DYLIB_MAKE_CMD=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) $(LDFLAGS)
|
||||||
INSTALL= cp -r
|
|
||||||
endif
|
endif
|
||||||
ifeq ($(uname_S),Darwin)
|
ifeq ($(uname_S),Darwin)
|
||||||
DYLIBSUFFIX=dylib
|
DYLIBSUFFIX=dylib
|
||||||
@ -161,11 +160,7 @@ clean:
|
|||||||
dep:
|
dep:
|
||||||
$(CC) -MM *.c
|
$(CC) -MM *.c
|
||||||
|
|
||||||
ifeq ($(uname_S),$(filter $(uname_S),SunOS OpenBSD))
|
INSTALL?= cp -pPR
|
||||||
INSTALL?= cp -r
|
|
||||||
endif
|
|
||||||
|
|
||||||
INSTALL?= cp -a
|
|
||||||
|
|
||||||
$(PKGCONFNAME): hiredis.h
|
$(PKGCONFNAME): hiredis.h
|
||||||
@echo "Generating $@ for pkgconfig..."
|
@echo "Generating $@ for pkgconfig..."
|
||||||
|
Loading…
Reference in New Issue
Block a user