From 3dd3ac4f0c14e230339856025c1843cd2d1c8d9c Mon Sep 17 00:00:00 2001 From: "Roger A. Light" Date: Thu, 16 Jul 2020 16:19:33 +0100 Subject: [PATCH] Path fix for travis. --- config.mk | 2 +- travis-install.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/config.mk b/config.mk index c92db3f5..49145ba7 100644 --- a/config.mk +++ b/config.mk @@ -334,7 +334,7 @@ ifeq ($(WITH_COVERAGE),yes) endif ifeq ($(WITH_CJSON),yes) - CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_CJSON -I/usr/include/cjson + CLIENT_CFLAGS:=$(CLIENT_CFLAGS) -DWITH_CJSON -I/usr/include/cjson -I/usr/local/include/cjson CLIENT_LDADD:=$(CLIENT_LDADD) -lcjson endif diff --git a/travis-install.sh b/travis-install.sh index c1be4a8a..262371f3 100755 --- a/travis-install.sh +++ b/travis-install.sh @@ -6,7 +6,7 @@ if [ "$TRAVIS_OS_NAME" == "linux" ]; then sudo apt-get install -y debhelper libc-ares-dev libssl-dev libwrap0-dev python-all python3-all uthash-dev xsltproc docbook-xsl libcunit1-dev git clone https://github.com/DaveGamble/cJSON make -C cJSON - sudo make -C cJSON install + sudo make PREFIX=/usr -C cJSON install fi if [ "$TRAVIS_OS_NAME" == "osx" ]; then