]> git.ipfire.org Git - thirdparty/freeswitch.git/commitdiff
[build] properly prepend PKG_CONFIG_PATHS on out of tree modules
authorMike Jerris <mike@signalwire.com>
Thu, 4 Jun 2020 18:28:07 +0000 (12:28 -0600)
committerAndrey Volk <andywolk@gmail.com>
Thu, 4 Jun 2020 18:42:07 +0000 (22:42 +0400)
src/mod/Makefile.am

index b9b1e1dd39bb6576b823d07a510a7a52ed8b127d..05bea17bc49835357231b7abc6093ed5bdde55d1 100644 (file)
@@ -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 ; \