summaryrefslogtreecommitdiff
path: root/main/Makefile
diff options
context:
space:
mode:
authorGeorge Joseph <gjoseph@digium.com>2016-10-28 15:59:19 -0600
committerGeorge Joseph <gjoseph@digium.com>2016-10-28 17:03:33 -0500
commit12bdde6a6cab0c88845c100764105ca8e44baa43 (patch)
treed04457aebb8108c642158ef44d2a518b3c0ca602 /main/Makefile
parent2995b31d189a12e19d5a9a1df07cf9ae8ac5b39a (diff)
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
Diffstat (limited to 'main/Makefile')
-rw-r--r--main/Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/main/Makefile b/main/Makefile
index d41302a7f..3db0392ff 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 := \