summaryrefslogtreecommitdiff
path: root/build_posix
diff options
context:
space:
mode:
authorMichael Cahill <michael.cahill@wiredtiger.com>2013-07-09 15:42:40 +1000
committerMichael Cahill <michael.cahill@wiredtiger.com>2013-07-09 15:42:40 +1000
commit4040f54345bd2251934e17d4af8c47c19d58a091 (patch)
treedb78f85d1ccc75ceb444dc55c5512dd3314fe958 /build_posix
parent81bc53cd3f49423afe9e7e2e4466607e978d2177 (diff)
downloadmongo-4040f54345bd2251934e17d4af8c47c19d58a091.tar.gz
Make IFS more portable: don't export, set explicitly and move to where it is needed.
Diffstat (limited to 'build_posix')
-rwxr-xr-xbuild_posix/makemake5
-rwxr-xr-xbuild_posix/reconf5
2 files changed, 2 insertions, 8 deletions
diff --git a/build_posix/makemake b/build_posix/makemake
index ef945ca559a..d36810870fe 100755
--- a/build_posix/makemake
+++ b/build_posix/makemake
@@ -2,15 +2,12 @@
#
# Build Makefile.am
-# We use read, make sure spaces separate input fields
-unset IFS
-export IFS
-
# Process Make.base, insert subdirs that exist from Make.subdirs
# (in release trees, some of the subdirs might be excluded).
(sed -n '1,/BEGIN SUBDIRS/p' Make.base
echo "SUBDIRS = ."
+IFS=$(printf ' \t\n')
sed -e 's/#.*$//' -e '/^$/d' Make.subdirs | (while read dir cond ; do
test -d ../$dir || continue
if test -n "$cond" ; then
diff --git a/build_posix/reconf b/build_posix/reconf
index 497c71a61ee..6e9912d7987 100755
--- a/build_posix/reconf
+++ b/build_posix/reconf
@@ -6,10 +6,6 @@ trap 'rm -f $t; exit 0' 0 1 2 3 13 15
# Allow this script to be run from anywhere
cd "`dirname \"$0\"`"
-# We use read, make sure spaces separate input fields
-unset IFS
-export IFS
-
# There's a cleanup function so we can easily clean out the directory.
clean()
{
@@ -36,6 +32,7 @@ echo "# This file is built automatically from build_posix/configure.ac.in."
sed -n '1,/BEGIN check existence/p' configure.ac.in
+IFS=$(printf ' \t\n')
sed -e 's/#.*$//' -e '/^$/d' Make.subdirs | while read dir cond ; do
test -d ../$dir || continue
echo 'AC_CONFIG_FILES(['$dir/Makefile'])'