From f5ee8eea008be5299df6aed6ea0dc88724e56f45 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Mon, 7 Dec 2009 07:22:00 +0000 Subject: [PATCH] fix setting of BASE passed to module makefiles when doing --srcdir builds (FSBUILD-211) git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@15814 d0543943-73ff-0310-b7d9-9358b9ac24b2 --- src/mod/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/mod/Makefile.am b/src/mod/Makefile.am index 693b1c3cfc..d478b0cd31 100644 --- a/src/mod/Makefile.am +++ b/src/mod/Makefile.am @@ -28,9 +28,9 @@ $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODUL test -d "$$buildmoddir" || mkdir -p $$buildmoddir ; \ (if test -f "$$moddir/Makefile" ; then \ test -f "$$buildmoddir/Makefile" || cp $$moddir/Makefile $$buildmoddir/Makefile ; \ - cd $$buildmoddir && MODDIR=$$moddir MODNAME=$$modname BASE=$(switch_srcdir) $(MAKE) $(AM_MAKEFLAGS) $$target; \ + cd $$buildmoddir && MODDIR=$$moddir MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) $$target; \ else\ - cd $$buildmoddir && MODDIR=$$moddir MODNAME=$$modname BASE=$(switch_srcdir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules $$target ;\ + cd $$buildmoddir && MODDIR=$$moddir MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules $$target ;\ fi;) || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \ fi; \ test -z "$$fail" ;