From b29b9802d4ac1752cb069eed9e5f8da6591cf4a1 Mon Sep 17 00:00:00 2001 From: Michael Jerris Date: Thu, 25 Oct 2007 14:13:42 +0000 Subject: [PATCH] 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 --- 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 d8c42c6009..1dc7b59408 100644 --- a/src/mod/Makefile.am +++ b/src/mod/Makefile.am @@ -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;)\