Revision
15814
Author
mikej
Date
2009-12-07 01:22:00 -0600 (Mon, 07 Dec 2009)

Log Message

fix setting of BASE passed to module makefiles when doing --srcdir builds (FSBUILD-211)

Modified Paths

Diff

Modified: freeswitch/trunk/src/mod/Makefile.am (15813 => 15814)


--- freeswitch/trunk/src/mod/Makefile.am	2009-12-07 07:14:34 UTC (rev 15813)
+++ freeswitch/trunk/src/mod/Makefile.am	2009-12-07 07:22:00 UTC (rev 15814)
@@ -28,9 +28,9 @@
 		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" ;