From: George Joseph <gjoseph@digium.com>
Date: Fri, 28 Oct 2016 21:59:19 +0000 (-0600)
Subject: pjproject_bundled:  Fix issue where "/version.mak" wasn't found
X-Git-Tag: 13.13.0-rc1~63
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b1c55dc9be90904363dbcf958a9fcc243c85629;p=thirdparty%2Fasterisk.git

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
---

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