From: Mike Jerris <mike@signalwire.com>
Date: Thu, 4 Jun 2020 18:28:07 +0000 (-0600)
Subject: [build] properly prepend PKG_CONFIG_PATHS on out of tree modules
X-Git-Tag: v1.10.4^2~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b9c836286e2e11536c33745bd0a594d9f0de2a6;p=thirdparty%2Ffreeswitch.git

[build] properly prepend PKG_CONFIG_PATHS on out of tree modules
---

diff --git a/src/mod/Makefile.am b/src/mod/Makefile.am
index b9b1e1dd39..05bea17bc4 100644
--- a/src/mod/Makefile.am
+++ b/src/mod/Makefile.am
@@ -53,13 +53,13 @@ $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODUL
 			fi ; \
 		fi ; \
 		if test -f  "$$buildmoddir/bootstrap.sh" -a ! -f  "$$buildmoddir/configure" -a ! -f  "$$buildmoddir/configure.sh" ; then \
-			cd $$buildmoddir && MODDIR=$$moddir MODNAME=$$modname BASE=$(switch_builddir) PKG_CONFIG_PATH=$(switch_builddir)/build/standalone_module:$PKG_CONFIG_PATH eval $$buildmoddir/bootstrap.sh ; \
+			cd $$buildmoddir && MODDIR=$$moddir MODNAME=$$modname BASE=$(switch_builddir) PKG_CONFIG_PATH=$(switch_builddir)/build/standalone_module:$(PKG_CONFIG_PATH) eval $$buildmoddir/bootstrap.sh ; \
 		fi ; \
 		if test -f  "$$buildmoddir/configure.sh" -a ! -f "$$buildmoddir/Makefile" ; then \
-			cd $$buildmoddir && MODDIR=$$moddir MODNAME=$$modname BASE=$(switch_builddir) PKG_CONFIG_PATH=$(switch_builddir)/build/standalone_module:$PKG_CONFIG_PATH eval $$buildmoddir/configure.sh ; \
+			cd $$buildmoddir && MODDIR=$$moddir MODNAME=$$modname BASE=$(switch_builddir) PKG_CONFIG_PATH=$(switch_builddir)/build/standalone_module:$(PKG_CONFIG_PATH) eval $$buildmoddir/configure.sh ; \
 		else \
 			if test -f  "$$buildmoddir/configure" -a ! -f "$$buildmoddir/Makefile" ; then \
-				cd $$buildmoddir && MODDIR=$$moddir MODNAME=$$modname BASE=$(switch_builddir) PKG_CONFIG_PATH=$(switch_builddir)/build/standalone_module:$PKG_CONFIG_PATH eval $$buildmoddir/configure ; \
+				cd $$buildmoddir && MODDIR=$$moddir MODNAME=$$modname BASE=$(switch_builddir) PKG_CONFIG_PATH=$(switch_builddir)/build/standalone_module:$(PKG_CONFIG_PATH) eval $$buildmoddir/configure ; \
 			fi ; \
 		fi ; \
 		if test -z "$$target" ; then target="all" ; fi ; \