<p>George Joseph has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/17864">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">build: Fix issue building non-bundled pjproject<br><br>The change to allow easier hacking on bundled pjproject was<br>trying to run the bundled make even if PJPROJECT_BUNDLED=no.<br>third-party/Makefile now checks for PJPROJECT_BUNDLED and<br>JANSSON_BUNDLED and skips them if they are "no".<br><br>ASTERISK-29858<br><br>Change-Id: I9427264fa3cb8b3f59a95e5f9693eac236a6f76d<br>---<br>M third-party/Makefile<br>1 file changed, 17 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.asterisk.org:29418/asterisk refs/changes/64/17864/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/third-party/Makefile b/third-party/Makefile</span><br><span>index e87e26f..532bf53 100644</span><br><span>--- a/third-party/Makefile</span><br><span>+++ b/third-party/Makefile</span><br><span>@@ -1,13 +1,26 @@</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+-include ../makeopts</span><br><span> include Makefile.rules</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-TP_SUBDIRS := pjproject jansson</span><br><span style="color: hsl(120, 100%, 40%);">+TP_SUBDIRS :=</span><br><span> # Sub directories that contain special install/uninstall targets must be explicitly listed</span><br><span> # to prevent accidentally running the package's default install target.</span><br><span style="color: hsl(0, 100%, 40%);">-TP_INSTALL_SUBDIRS := pjproject jansson</span><br><span style="color: hsl(120, 100%, 40%);">+TP_INSTALL_SUBDIRS :=</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ifeq ($(PJPROJECT_BUNDLED),yes)</span><br><span style="color: hsl(120, 100%, 40%);">+TP_SUBDIRS += pjproject</span><br><span style="color: hsl(120, 100%, 40%);">+TP_INSTALL_SUBDIRS += pjproject</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ifeq ($(JANSSON_BUNDLED),yes)</span><br><span style="color: hsl(120, 100%, 40%);">+TP_SUBDIRS += jansson</span><br><span style="color: hsl(120, 100%, 40%);">+TP_INSTALL_SUBDIRS += jansson</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span> </span><br><span> .PHONY: all dist-clean distclean install clean moduleinfo makeopts uninstall $(TP_SUBDIRS)</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ifneq ($(TP_SUBDIRS),)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> override MAKECMDGOALS?=all</span><br><span> </span><br><span> MAKECMDGOALS:=$(subst dist-clean,distclean,$(MAKECMDGOALS))</span><br><span>@@ -17,3 +30,5 @@</span><br><span> </span><br><span> $(TP_SUBDIRS):</span><br><span>       +$(CMD_PREFIX) $(SUBMAKE) -C $@ $(MAKECMDGOALS)</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+endif</span><br><span>\ No newline at end of file</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/17864">change 17864</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/c/asterisk/+/17864"/><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-Change-Id: I9427264fa3cb8b3f59a95e5f9693eac236a6f76d </div>
<div style="display:none"> Gerrit-Change-Number: 17864 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>