Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
ruanhaishen
hiredis
Commits
0e9af8ac
Unverified
Commit
0e9af8ac
authored
May 14, 2018
by
Ryan Schmidt
Committed by
GitHub
May 14, 2018
Browse files
Use cp -pPR instead of cp -a
This should be equivalent but compatible with older versions of cp.
parent
c1af0e84
Changes
1
Show whitespace changes
Inline
Side-by-side
Makefile
View file @
0e9af8ac
...
@@ -58,7 +58,6 @@ uname_S := $(shell sh -c 'uname -s 2>/dev/null || echo not')
...
@@ -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:
...
@@ -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..."
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment