aboutsummaryrefslogtreecommitdiffstats
path: root/build_tools
diff options
context:
space:
mode:
authorseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-08 17:15:22 +0000
committerseanbright <seanbright@f38db490-d61c-443f-a65b-d21fe96a405b>2008-09-08 17:15:22 +0000
commit02ca0c9cf56ccc61e03853ee4b4f7b278e0578ed (patch)
treec5f264482bc1757778bbbf1a156a8827047de359 /build_tools
parent074bda7125046214f12324db44fc3e344603e1db (diff)
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 ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.1@141684 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'build_tools')
-rwxr-xr-xbuild_tools/make_buildopts_h6
1 files changed, 3 insertions, 3 deletions
diff --git a/build_tools/make_buildopts_h b/build_tools/make_buildopts_h
index f721dbca2..8409f805f 100755
--- a/build_tools/make_buildopts_h
+++ b/build_tools/make_buildopts_h
@@ -7,7 +7,7 @@ cat << END
*/
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 @@ for x in ${TMP}; do
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"