Revision
15708
Author
mikej
Date
2009-11-28 23:50:59 -0600 (Sat, 28 Nov 2009)

Log Message

more --srcdir fixes

Modified Paths

Diff

Modified: freeswitch/trunk/Makefile.am (15707 => 15708)


--- freeswitch/trunk/Makefile.am	2009-11-29 05:32:05 UTC (rev 15707)
+++ freeswitch/trunk/Makefile.am	2009-11-29 05:50:59 UTC (rev 15708)
@@ -228,10 +228,10 @@
 libs/libedit/src/.libs/libedit.a:
 	cd libs/libedit && $(MAKE)
 
-$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/quiet_libtool modules.conf 
+$(libfreeswitch_la_SOURCES): $(CORE_LIBS) $(switch_builddir)/quiet_libtool $(switch_builddir)/modules.conf 
 
 $(switch_builddir)/quiet_libtool: $(switch_builddir)/libtool
-	@cat libtool | sed -e 's|$$show "$$command"|if test -z "$$suppress_output" ; then $$show "Compiling $$srcfile ..." ; fi|' > quiet_libtool
+	@cat libtool | sed -e 's|$$show "$$command"|if test -z "$$suppress_output" ; then $$show "Compiling $$srcfile ..." ; fi|' > $(switch_builddir)/quiet_libtool
 
 
 yaml-files:
@@ -512,7 +512,7 @@
 libclean:
 	@for file in `ls ./libs`; do pushd "./libs/"$$file; make clean; rm -f .built; popd; done
 
-modules.conf:
+$(switch_builddir)/modules.conf:
 	if test -f $@; then touch $@; else cp $(switch_srcdir)/build/modules.conf.in $@ ;fi
 
 $(OUR_MODULES):

Modified: freeswitch/trunk/src/mod/Makefile.am (15707 => 15708)


--- freeswitch/trunk/src/mod/Makefile.am	2009-11-29 05:32:05 UTC (rev 15707)
+++ freeswitch/trunk/src/mod/Makefile.am	2009-11-29 05:50:59 UTC (rev 15708)
@@ -25,6 +25,7 @@
 	then echo ; echo "WARNING $$modname is not a valid FreeSWITCH module dir, skipping it....." ; else \
 		echo ;\
 		echo making $$target $$modname ;\
+		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; \