From: Corey Farrell Date: Tue, 11 Sep 2018 03:28:04 +0000 (-0400) Subject: Build System: Resolve conflict between DESTDIR and bundled jansson. X-Git-Tag: 15.7.0-rc1~55 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=214b1545b13ff6df643cf93a834957ce032cabe1;p=thirdparty%2Fasterisk.git 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 --- 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: