You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
44 lines
1.5 KiB
44 lines
1.5 KiB
10 years ago
|
From 4355ab3c8fa7ad98b8a21267f84ebbaf47e2d2f8 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Sebastian Wiedenroth <wiedi@frubar.net>
|
||
|
|
Date: Fri, 23 Jan 2015 19:01:19 +0100
|
||
|
|
Subject: [PATCH] Fix Makefile install problems
|
||
|
|
|
||
|
|
Adds DESTDIR support
|
||
|
|
Fixes INSTALL_PKGCONF_PATH
|
||
|
|
Properly copies {read,shs}.h now during make install
|
||
|
|
|
||
|
|
Closes #297
|
||
|
|
---
|
||
|
|
Makefile | 8 ++++----
|
||
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile b/Makefile
|
||
|
|
index d683aec..c2cee1a 100644
|
||
|
|
--- a/Makefile
|
||
|
|
+++ b/Makefile
|
||
|
|
@@ -18,9 +18,9 @@ PREFIX?=/usr/local
|
||
|
|
INCLUDE_PATH?=include/hiredis
|
||
|
|
LIBRARY_PATH?=lib
|
||
|
|
PKGCONF_PATH?=pkgconfig
|
||
|
|
-INSTALL_INCLUDE_PATH= $(PREFIX)/$(INCLUDE_PATH)
|
||
|
|
-INSTALL_LIBRARY_PATH= $(PREFIX)/$(LIBRARY_PATH)
|
||
|
|
-INSTALL_PKGCONF_PATH= $(LIBRARY_PATH)/$(PKGCONF_PATH)
|
||
|
|
+INSTALL_INCLUDE_PATH= $(DESTDIR)$(PREFIX)/$(INCLUDE_PATH)
|
||
|
|
+INSTALL_LIBRARY_PATH= $(DESTDIR)$(PREFIX)/$(LIBRARY_PATH)
|
||
|
|
+INSTALL_PKGCONF_PATH= $(INSTALL_LIBRARY_PATH)/$(PKGCONF_PATH)
|
||
|
|
|
||
|
|
# redis-server configuration used for testing
|
||
|
|
REDIS_PORT=56379
|
||
|
|
@@ -162,7 +162,7 @@ $(PKGCONFNAME): $(PKGCONF_SRCNAME)
|
||
|
|
|
||
|
|
install: $(DYLIBNAME) $(STLIBNAME)
|
||
|
|
mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH)
|
||
|
|
- $(INSTALL) hiredis.h async.h adapters $(INSTALL_INCLUDE_PATH)
|
||
|
|
+ $(INSTALL) hiredis.h async.h read.h sds.h adapters $(INSTALL_INCLUDE_PATH)
|
||
|
|
$(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME)
|
||
|
|
cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME)
|
||
|
|
cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MAJOR_NAME) $(DYLIBNAME)
|
||
|
|
--
|
||
|
|
2.1.0
|
||
|
|
|