<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/9655">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Jenkins2: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Build System: Fix bundled jansson install.<br><br>Update the bundled jansson Makefile to do nothing during Asterisk<br>install, use a target that is not phony to initiate the jansson make and<br>install.<br><br>Change-Id: I7643cc3d39af9feba8fc0da676b646efc5f8b3bb<br>---<br>M third-party/jansson/Makefile<br>1 file changed, 5 insertions(+), 7 deletions(-)<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 a85efa0..2d9ef53 100644</span><br><span>--- a/third-party/jansson/Makefile</span><br><span>+++ b/third-party/jansson/Makefile</span><br><span>@@ -1,4 +1,4 @@</span><br><span style="color: hsl(0, 100%, 40%);">-.PHONY: _all all _install install clean distclean configure</span><br><span style="color: hsl(120, 100%, 40%);">+.PHONY: all install clean distclean configure</span><br><span> </span><br><span> .NOTPARALLEL:</span><br><span> </span><br><span>@@ -39,10 +39,9 @@</span><br><span>             $(warning ASTTOPDIR/menuselect hasn't been run yet.  Can't find debug options.)</span><br><span>         endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-        all: _all</span><br><span style="color: hsl(0, 100%, 40%);">-        install: _install</span><br><span style="color: hsl(120, 100%, 40%);">+        all: dest/include/jansson.h</span><br><span>     else</span><br><span style="color: hsl(0, 100%, 40%);">-        all install:</span><br><span style="color: hsl(120, 100%, 40%);">+        all:</span><br><span>     endif</span><br><span> endif</span><br><span> </span><br><span>@@ -53,7 +52,7 @@</span><br><span> ECHO_PREFIX := $(ECHO_PREFIX) echo '[jansson] '</span><br><span> SHELL_ECHO_PREFIX := echo '[jansson] '</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-_all: source/config.status</span><br><span style="color: hsl(120, 100%, 40%);">+dest/include/jansson.h: source/config.status</span><br><span>    $(ECHO_PREFIX) Building bundled jansson.</span><br><span>     $(CMD_PREFIX) (cd source; make)</span><br><span>      $(CMD_PREFIX) (cd source; make install)</span><br><span>@@ -86,8 +85,7 @@</span><br><span> </span><br><span> configure: source/config.status</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-_install: _all</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+install:</span><br><span> uninstall:</span><br><span> </span><br><span> clean:</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/9655">change 9655</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/9655"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I7643cc3d39af9feba8fc0da676b646efc5f8b3bb </div>
<div style="display:none"> Gerrit-Change-Number: 9655 </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: Jenkins2 </div>