From 214b1545b13ff6df643cf93a834957ce032cabe1 Mon Sep 17 00:00:00 2001 From: Corey Farrell Date: Mon, 10 Sep 2018 23:28:04 -0400 Subject: [PATCH] Build System: Resolve conflict between DESTDIR and bundled jansson. If Asterisk is built using a DESTDIR this will cause the bundled jansson to be installed to an unexpected location and we will fail to find it. Change-Id: Id033e2813261e0d45232383d44c6391122169548 --- third-party/jansson/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/third-party/jansson/Makefile b/third-party/jansson/Makefile index 25853509bd..ca57b1a176 100644 --- a/third-party/jansson/Makefile +++ b/third-party/jansson/Makefile @@ -55,7 +55,7 @@ SHELL_ECHO_PREFIX := echo '[jansson] ' dest/include/jansson.h: source/config.status $(ECHO_PREFIX) Building bundled jansson. $(CMD_PREFIX) (cd source; make $(REALLY_QUIET)) - $(CMD_PREFIX) (cd source; make install $(REALLY_QUIET)) + $(CMD_PREFIX) (cd source; make install DESTDIR= $(REALLY_QUIET)) .DELETE_ON_ERROR: -- 2.47.2