From 722e3409c7d133524750036655bf24d3193ff951 Mon Sep 17 00:00:00 2001 From: Bjorn Svensson Date: Mon, 19 Sep 2022 19:49:55 +0200 Subject: Additional include directory given by pkg-config (#1118) * Update include example in README * Update pkg-config installed via CMake Gives the include directory to enable the use of: #include but keeps the existing include dir. for backwards compatibility. Example: > pkg-config hiredis --cflags -D_FILE_OFFSET_BITS=64 -I/usr/local/include/hiredis -I/usr/local/include * Update pkg-config installed via Make Gives the include directory to enable the use of: #include but keeps the existing include path for backwards compatibility. Example: > pkg-config hiredis --cflags -D_FILE_OFFSET_BITS=64 -I/usr/local/include/hiredis -I/usr/local/include --- Makefile | 8 +++++--- README.md | 4 ++-- hiredis.pc.in | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index b9783b7..ce1fbbb 100644 --- a/Makefile +++ b/Makefile @@ -275,20 +275,22 @@ $(PKGCONFNAME): hiredis.h @echo prefix=$(PREFIX) > $@ @echo exec_prefix=\$${prefix} >> $@ @echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@ - @echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@ + @echo includedir=$(PREFIX)/include >> $@ + @echo pkgincludedir=$(PREFIX)/$(INCLUDE_PATH) >> $@ @echo >> $@ @echo Name: hiredis >> $@ @echo Description: Minimalistic C client library for Redis. >> $@ @echo Version: $(HIREDIS_MAJOR).$(HIREDIS_MINOR).$(HIREDIS_PATCH) >> $@ @echo Libs: -L\$${libdir} -lhiredis >> $@ - @echo Cflags: -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@ + @echo Cflags: -I\$${pkgincludedir} -I\$${includedir} -D_FILE_OFFSET_BITS=64 >> $@ $(SSL_PKGCONFNAME): hiredis_ssl.h @echo "Generating $@ for pkgconfig..." @echo prefix=$(PREFIX) > $@ @echo exec_prefix=\$${prefix} >> $@ @echo libdir=$(PREFIX)/$(LIBRARY_PATH) >> $@ - @echo includedir=$(PREFIX)/$(INCLUDE_PATH) >> $@ + @echo includedir=$(PREFIX)/include >> $@ + @echo pkgincludedir=$(PREFIX)/$(INCLUDE_PATH) >> $@ @echo >> $@ @echo Name: hiredis_ssl >> $@ @echo Description: SSL Support for hiredis. >> $@ diff --git a/README.md b/README.md index f517800..04985ef 100644 --- a/README.md +++ b/README.md @@ -609,8 +609,8 @@ unaffected so no additional dependencies are introduced. First, you'll need to make sure you include the SSL header file: ```c -#include "hiredis.h" -#include "hiredis_ssl.h" +#include +#include ``` You will also need to link against `libhiredis_ssl`, **in addition** to diff --git a/hiredis.pc.in b/hiredis.pc.in index 91b7731..c7b8e0e 100644 --- a/hiredis.pc.in +++ b/hiredis.pc.in @@ -9,4 +9,4 @@ Name: hiredis Description: Minimalistic C client library for Redis. Version: @PROJECT_VERSION@ Libs: -L${libdir} -lhiredis -Cflags: -I${pkgincludedir} -D_FILE_OFFSET_BITS=64 +Cflags: -I${pkgincludedir} -I${includedir} -D_FILE_OFFSET_BITS=64 -- cgit v1.2.3