[Asterisk-code-review] Build System: Resolve conflict between DESTDIR and bundled j... (asterisk[master])

[Joshua Colp]

Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/10077 )

Change subject: Build System: Resolve conflict between DESTDIR and bundled jansson.
......................................................................

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
---
M third-party/jansson/Makefile
1 file changed, 1 insertion(+), 1 deletion(-)

Approvals:
  Joshua Colp: Looks good to me, but someone else must approve; Approved for Submit
  Richard Mudgett: Looks good to me, approved



diff --git a/third-party/jansson/Makefile b/third-party/jansson/Makefile
index 2585350..ca57b1a 100644
--- a/third-party/jansson/Makefile
+++ b/third-party/jansson/Makefile
@@ -55,7 +55,7 @@
 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:
 

-- 
To view, visit https://gerrit.asterisk.org/10077
To unsubscribe, or for help writing mail filters, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: Id033e2813261e0d45232383d44c6391122169548
Gerrit-Change-Number: 10077
Gerrit-PatchSet: 1
Gerrit-Owner: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180912/66f6ce1b/attachment.html>