]>
Commit | Line | Data |
---|---|---|
4486cffa JB |
1 | --- hiredis-0.13.3/Makefile.orig 2015-09-16 12:25:02.000000000 +0200 |
2 | +++ hiredis-0.13.3/Makefile 2016-11-08 16:37:58.943150777 +0100 | |
3 | @@ -49,7 +49,7 @@ | |
4 | DYLIB_MINOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_SONAME) | |
e2170762 JB |
5 | DYLIB_MAJOR_NAME=$(LIBNAME).$(DYLIBSUFFIX).$(HIREDIS_MAJOR) |
6 | DYLIBNAME=$(LIBNAME).$(DYLIBSUFFIX) | |
7 | -DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MINOR_NAME) -o $(DYLIBNAME) $(LDFLAGS) | |
8 | +DYLIB_MAKE_CMD=$(CC) -shared -Wl,-soname,$(DYLIB_MAJOR_NAME) -o $(DYLIBNAME) $(LDFLAGS) | |
9 | STLIBNAME=$(LIBNAME).$(STLIBSUFFIX) | |
10 | STLIB_MAKE_CMD=ar rcs $(STLIBNAME) | |
11 | ||
4486cffa | 12 | @@ -140,8 +140,8 @@ |
392c08b8 JB |
13 | |
14 | hiredis-test: test.o $(STLIBNAME) | |
e0ef7478 ER |
15 | |
16 | -hiredis-%: %.o $(STLIBNAME) | |
392c08b8 | 17 | - $(CC) $(REAL_CFLAGS) -o $@ $(REAL_LDFLAGS) $< $(STLIBNAME) |
e0ef7478 | 18 | +hiredis-%: %.o $(DYLIBNAME) |
392c08b8 | 19 | + $(CC) $(REAL_CFLAGS) -o $@ $(REAL_LDFLAGS) $< -L. -l$(subst lib,,$(LIBNAME)) |
e0ef7478 ER |
20 | |
21 | test: hiredis-test | |
22 | ./hiredis-test | |
4486cffa JB |
23 | @@ -184,6 +184,7 @@ |
24 | mkdir -p $(INSTALL_INCLUDE_PATH) $(INSTALL_LIBRARY_PATH) | |
392c08b8 | 25 | $(INSTALL) hiredis.h async.h read.h sds.h adapters $(INSTALL_INCLUDE_PATH) |
e2170762 | 26 | $(INSTALL) $(DYLIBNAME) $(INSTALL_LIBRARY_PATH)/$(DYLIB_MINOR_NAME) |
4486cffa JB |
27 | + cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIB_MAJOR_NAME) |
28 | cd $(INSTALL_LIBRARY_PATH) && ln -sf $(DYLIB_MINOR_NAME) $(DYLIBNAME) | |
e2170762 | 29 | $(INSTALL) $(STLIBNAME) $(INSTALL_LIBRARY_PATH) |
392c08b8 | 30 | mkdir -p $(INSTALL_PKGCONF_PATH) |