[asterisk-commits] pjproject bundled: Fix issue where "/version.mak" wasn't found (asterisk[14])

[SVN commits to the Asterisk project]

Anonymous Coward #1000019 has submitted this change and it was merged. ( https://gerrit.asterisk.org/4226 )

Change subject: pjproject_bundled:  Fix issue where "/version.mak" wasn't found
......................................................................


pjproject_bundled:  Fix issue where "/version.mak" wasn't found

main/Makefile includes third-party/pjproject/build.mak but
doesn't set PJDIR beforehand so "include $(PJDIR)/version.mak"
evaluates to "/version.mak".  Fix is to set PJDIR in main/Makefile
before the include.

Change-Id: I0f7c67d60209049056fe9c4b041bf0463aa95604
---
M main/Makefile
1 file changed, 1 insertion(+), 0 deletions(-)

Approvals:
  Richard Mudgett: Looks good to me, but someone else must approve
  Anonymous Coward #1000019: Verified
  Joshua Colp: Looks good to me, approved
  Corey Farrell: Looks good to me, but someone else must approve



diff --git a/main/Makefile b/main/Makefile
index d41302a..3db0392 100644
--- a/main/Makefile
+++ b/main/Makefile
@@ -253,6 +253,7 @@
 ASTPJ_SO_VERSION=2
 ASTPJ_LDLIBS=-L. -lasteriskpj
 
+PJDIR=$(ASTTOPDIR)/$(PJPROJECT_DIR)/source
 -include $(ASTTOPDIR)/$(PJPROJECT_DIR)/build.mak
 
 PJPROJECT_LDLIBS := \

-- 
To view, visit https://gerrit.asterisk.org/4226
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0f7c67d60209049056fe9c4b041bf0463aa95604
Gerrit-PatchSet: 1
Gerrit-Project: asterisk
Gerrit-Branch: 14
Gerrit-Owner: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Anonymous Coward #1000019
Gerrit-Reviewer: Corey Farrell <git at cfware.com>
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
Gerrit-Reviewer: Richard Mudgett <rmudgett at digium.com>