[asterisk-commits] seanbright: branch 1.6.1 r141684 - in /branches/1.6.1: ./ build_tools/

[SVN commits to the Asterisk project]

Author: seanbright
Date: Mon Sep  8 12:15:22 2008
New Revision: 141684

URL: http://svn.digium.com/view/asterisk?view=rev&rev=141684
Log:
Merged revisions 141682 via svnmerge from 
https://origsvn.digium.com/svn/asterisk/trunk

........
r141682 | seanbright | 2008-09-08 13:13:04 -0400 (Mon, 08 Sep 2008) | 9 lines

Quote the arguments to grep so that sh on various platforms doesn't choke
on the special characters (like ^).

(closes issue #13417)
Reported by: dougm
Patches:
      13417.make_buildopts_h.patch uploaded by seanbright (license 71)
Tested by: dougm

........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/build_tools/make_buildopts_h

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/build_tools/make_buildopts_h
URL: http://svn.digium.com/view/asterisk/branches/1.6.1/build_tools/make_buildopts_h?view=diff&rev=141684&r1=141683&r2=141684
==============================================================================
--- branches/1.6.1/build_tools/make_buildopts_h (original)
+++ branches/1.6.1/build_tools/make_buildopts_h Mon Sep  8 12:15:22 2008
@@ -7,7 +7,7 @@
  */
 
 END
-TMP=`${GREP} -e ^MENUSELECT_CFLAGS menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'`
+TMP=`${GREP} -e "^MENUSELECT_CFLAGS" menuselect.makeopts | sed 's/MENUSELECT_CFLAGS\=//g' | sed 's/-D//g'`
 for x in ${TMP}; do
 	echo "#define ${x} 1"
 	if test "x${BUILDOPTS}" != "x" ; then
@@ -16,12 +16,12 @@
 		BUILDOPTS="${x}"
 	fi
 done
-TMP=`${GREP} -e ^MENUSELECT_BUILD_DEPS menuselect.makeopts | sed 's/MENUSELECT_BUILD_DEPS\=//g'`
+TMP=`${GREP} -e "^MENUSELECT_BUILD_DEPS" menuselect.makeopts | sed 's/MENUSELECT_BUILD_DEPS\=//g'`
 for x in ${TMP}; do
 	x2=`echo ${x} | tr a-z A-Z`
 	echo "#define AST_MODULE_${x2} 1"
 done
-if ${GREP} AST_DEVMODE makeopts | ${GREP} -q yes
+if ${GREP} "AST_DEVMODE" makeopts | ${GREP} -q "yes"
 then
 	echo "#define AST_DEVMODE 1"
 	TMP="${TMP} AST_DEVMODE"