diff --git a/Makefile b/Makefile index 219c07669..10de1deae 100644 --- a/Makefile +++ b/Makefile @@ -603,8 +603,11 @@ OPTIONS_OBJS += src/hlua.o endif ifneq ($(USE_DEVICEATLAS),) -DEVICEATLAS_INC = -DEVICEATLAS_LIB = +# Use DEVICEATLAS_SRC and possibly DEVICEATLAS_INC and DEVICEATLAS_LIB to force path +# to 51degrees headers and libraries if needed. +DEVICEATLAS_SRC = +DEVICEATLAS_INC = $(DEVICEATLAS_SRC) +DEVICEATLAS_LIB = $(DEVICEATLAS_SRC) OPTIONS_OBJS += $(DEVICEATLAS_LIB)/json.o OPTIONS_OBJS += $(DEVICEATLAS_LIB)/dac.o OPTIONS_OBJS += src/da.o diff --git a/README b/README index 3d7df12f2..ab007643e 100644 --- a/README +++ b/README @@ -211,7 +211,11 @@ In order to add DeviceAtlas Device Detection support, you would need to download the API source code from https://deviceatlas.com/deviceatlas-haproxy-module and once extracted : - $ make TARGET= USE_PCRE=1 USE_DEVICEATLAS=1 DEVICEATLAS_INC= DEVICEATLAS_LIB= + $ make TARGET= USE_PCRE=1 USE_DEVICEATLAS=1 DEVICEATLAS_SRC= + +Optionally DEVICEATLAS_INC and DEVICEATLAS_LIB may be set to override the path +to the include files and libraries respectively if they're not in the source +directory. These are supported DeviceAtlas directives (see doc/configuration.txt) : - deviceatlas-json-file .