Author: mikej Date: Thu Oct 25 10:13:42 2007 New Revision: 6050 Modified: freeswitch/trunk/src/mod/Makefile.am Log: make modules building handle whitespace after modname in modules.conf (reported by trixter) Modified: freeswitch/trunk/src/mod/Makefile.am ============================================================================== --- freeswitch/trunk/src/mod/Makefile.am (original) +++ freeswitch/trunk/src/mod/Makefile.am Thu Oct 25 10:13:42 2007 @@ -7,7 +7,7 @@ @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 @@ 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;)\