retronetworking
/
freeswitch
13
0
Fork 0
Code Pull Requests Releases Activity

make modules building handle whitespace after modname in modules.conf (reported by trixter) 

git-svn-id: http://svn.freeswitch.org/svn/freeswitch/trunk@6050 d0543943-73ff-0310-b7d9-9358b9ac24b2
This commit is contained in:
Michael Jerris 2007-10-25 14:13:42 +00:00
parent 690d697a07
commit b29b9802d4
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/mod/Makefile.am
View File

@ -7,7 +7,7 @@ $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODUL
@set fnord $$MAKEFLAGS; amf=$$2; \
target=`echo $@ | sed -e 's|^.*-||'`; \
modname=`echo $@ | sed -e 's|-.*||'`; \
confmoddir=`cat $(switch_builddir)/modules.conf | grep $$modname$$ | sed -e 's|#||' `; \
confmoddir=`cat $(switch_builddir)/modules.conf | grep $$modname | sed -e 's|#||' | sed -e 's| ||' `; \
if test -z "$$confmoddir" ; then moddir=$@ ; else \
if test -d "$(switch_srcdir)/src/mod/$$confmoddir" ; then \
moddir="$(switch_srcdir)/src/mod/$$confmoddir" ; else \
@ -17,7 +17,7 @@ $(OUR_MODULES) $(OUR_CLEAN_MODULES) $(OUR_INSTALL_MODULES) $(OUR_UNINSTALL_MODUL
if test -z "$$target" ; then target="all" ; fi ; \
echo ;\
echo making $$target $$modname ;\
(if test -f $$moddir/Makefile ; then \
(if test -f "$$moddir/Makefile" ; then \
cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) $$target; else\
cd $$moddir && MODNAME=$$modname BASE=$(switch_builddir) $(MAKE) $(AM_MAKEFLAGS) -f $(switch_builddir)/build/modmake.rules $$target ;\
fi;)\