Commit df203bc3 authored by Pieter Noordhuis's avatar Pieter Noordhuis
Browse files

cp on Solaris doesn't have -a

parent 81c00aab
...@@ -23,6 +23,7 @@ ifeq ($(uname_S),SunOS) ...@@ -23,6 +23,7 @@ ifeq ($(uname_S),SunOS)
DYLIB_MAKE_CMD?=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME) DYLIB_MAKE_CMD?=$(CC) -G -o $(DYLIBNAME) -h $(DYLIB_MINOR_NAME)
STLIBNAME?=$(LIBNAME).$(STLIBSUFFIX) STLIBNAME?=$(LIBNAME).$(STLIBSUFFIX)
STLIB_MAKE_CMD?=ar rcs $(STLIBNAME) STLIB_MAKE_CMD?=ar rcs $(STLIBNAME)
INSTALL= cp -r
else else
ifeq ($(uname_S),Darwin) ifeq ($(uname_S),Darwin)
CFLAGS?=$(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF) CFLAGS?=$(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
...@@ -37,6 +38,7 @@ ifeq ($(uname_S),Darwin) ...@@ -37,6 +38,7 @@ ifeq ($(uname_S),Darwin)
DYLIB_MAKE_CMD?=libtool -dynamic -o $(DYLIBNAME) -install_name $(DYLIB_MINOR_NAME) -lm $(DEBUG) - DYLIB_MAKE_CMD?=libtool -dynamic -o $(DYLIBNAME) -install_name $(DYLIB_MINOR_NAME) -lm $(DEBUG) -
STLIBNAME?=$(LIBNAME).$(STLIBSUFFIX) STLIBNAME?=$(LIBNAME).$(STLIBSUFFIX)
STLIB_MAKE_CMD?=libtool -static -o $(STLIBNAME) - STLIB_MAKE_CMD?=libtool -static -o $(STLIBNAME) -
INSTALL= cp -a
else else
CFLAGS?=$(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF) CFLAGS?=$(OPTIMIZATION) -fPIC -Wall -W -Wstrict-prototypes -Wwrite-strings $(ARCH) $(PROF)
CCLINK?=-lm -pthread CCLINK?=-lm -pthread
...@@ -49,6 +51,7 @@ else ...@@ -49,6 +51,7 @@ else
DYLIB_MAKE_CMD?=gcc -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) DYLIB_MAKE_CMD?=gcc -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME)
STLIBNAME?=$(LIBNAME).$(STLIBSUFFIX) STLIBNAME?=$(LIBNAME).$(STLIBSUFFIX)
STLIB_MAKE_CMD?=ar rcs $(STLIBNAME) STLIB_MAKE_CMD?=ar rcs $(STLIBNAME)
INSTALL= cp -a
endif endif
endif endif
...@@ -60,7 +63,6 @@ INCLUDE_PATH?=include/hiredis ...@@ -60,7 +63,6 @@ INCLUDE_PATH?=include/hiredis
LIBRARY_PATH?=lib LIBRARY_PATH?=lib
INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH) INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH)
INSTALL_LIBRARY_PATH= $(PREFIX)/$(LIBRARY_PATH) INSTALL_LIBRARY_PATH= $(PREFIX)/$(LIBRARY_PATH)
INSTALL= cp -a
all: $(DYLIBNAME) $(BINS) all: $(DYLIBNAME) $(BINS)
......
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