<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/10075">View Change</a></p><div style="white-space:pre-wrap">Approvals:
George Joseph: Looks good to me, but someone else must approve
Joshua Colp: Looks good to me, approved; Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Build System: Resolve conflict between DESTDIR and bundled jansson.<br><br>If Asterisk is built using a DESTDIR this will cause the bundled jansson<br>to be installed to an unexpected location and we will fail to find it.<br><br>Change-Id: Id033e2813261e0d45232383d44c6391122169548<br>---<br>M third-party/jansson/Makefile<br>1 file changed, 1 insertion(+), 1 deletion(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/third-party/jansson/Makefile b/third-party/jansson/Makefile</span><br><span>index 2585350..ca57b1a 100644</span><br><span>--- a/third-party/jansson/Makefile</span><br><span>+++ b/third-party/jansson/Makefile</span><br><span>@@ -55,7 +55,7 @@</span><br><span> dest/include/jansson.h: source/config.status</span><br><span> $(ECHO_PREFIX) Building bundled jansson.</span><br><span> $(CMD_PREFIX) (cd source; make $(REALLY_QUIET))</span><br><span style="color: hsl(0, 100%, 40%);">- $(CMD_PREFIX) (cd source; make install $(REALLY_QUIET))</span><br><span style="color: hsl(120, 100%, 40%);">+ $(CMD_PREFIX) (cd source; make install DESTDIR= $(REALLY_QUIET))</span><br><span> </span><br><span> .DELETE_ON_ERROR:</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/10075">change 10075</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/10075"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id033e2813261e0d45232383d44c6391122169548 </div>
<div style="display:none"> Gerrit-Change-Number: 10075 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Corey Farrell <git@cfware.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>