]> git.ipfire.org Git - thirdparty/asterisk.git/commitdiff
pjproject_bundled: Fix issue where "/version.mak" wasn't found 25/4225/1
authorGeorge Joseph <gjoseph@digium.com>
Fri, 28 Oct 2016 21:59:19 +0000 (15:59 -0600)
committerGeorge Joseph <gjoseph@digium.com>
Fri, 28 Oct 2016 21:59:19 +0000 (15:59 -0600)
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

main/Makefile

index e476969c9acd29bfb7548a774052b754f6bc422b..e0b7135a10daeb70ebffe11a8ad220be958b1392 100644 (file)
@@ -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 := \