diff --git i/bootstrap.sh w/bootstrap.sh
index 36e92ff..86d6eff 100755
i
|
w
|
rm -f config.log
|
213 | 213 | |
214 | 214 | # Build bjam |
215 | 215 | if test "x$BJAM" = x; then |
216 | | echo -n "Building Boost.Build engine with toolset $TOOLSET... " |
| 216 | printf %s "Building Boost.Build engine with toolset $TOOLSET... " |
217 | 217 | pwd=`pwd` |
218 | 218 | (cd "$my_dir/tools/build/v2/engine" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1 |
219 | 219 | if [ $? -ne 0 ]; then |
… |
… |
fi
|
270 | 270 | |
271 | 271 | if test "x$flag_no_python" = x; then |
272 | 272 | if test "x$PYTHON_VERSION" = x; then |
273 | | echo -n "Detecting Python version... " |
| 273 | printf %s "Detecting Python version... " |
274 | 274 | PYTHON_VERSION=`$PYTHON -c "import sys; print (\"%d.%d\" % (sys.version_info[0], sys.version_info[1]))"` |
275 | 275 | echo $PYTHON_VERSION |
276 | 276 | fi |
277 | 277 | |
278 | 278 | if test "x$PYTHON_ROOT" = x; then |
279 | | echo -n "Detecting Python root... " |
| 279 | printf %s "Detecting Python root... " |
280 | 280 | PYTHON_ROOT=`$PYTHON -c "import sys; print(sys.prefix)"` |
281 | 281 | echo $PYTHON_ROOT |
282 | 282 | fi |
283 | 283 | fi |
284 | 284 | |
285 | 285 | # Configure ICU |
286 | | echo -n "Unicode/ICU support for Boost.Regex?... " |
| 286 | printf %s "Unicode/ICU support for Boost.Regex?... " |
287 | 287 | if test "x$flag_icu" != xno; then |
288 | 288 | if test "x$ICU_ROOT" = x; then |
289 | 289 | COMMON_ICU_PATHS="/usr /usr/local /sw" |
diff --git i/tools/boostbook/setup_boostbook.sh w/tools/boostbook/setup_boostbook.sh
index 0e79031..7ddddc9 100644
i
|
w
|
fi
|
30 | 30 | |
31 | 31 | DOCBOOK_XSL_DIR="$PWD/docbook-xsl-$DOCBOOK_XSL_VERSION" |
32 | 32 | if test ! -d docbook-xsl-$DOCBOOK_XSL_VERSION; then |
33 | | echo -n "Expanding DocBook XSLT Stylesheets into $DOCBOOK_XSL_DIR..." |
| 33 | printf %s "Expanding DocBook XSLT Stylesheets into $DOCBOOK_XSL_DIR..." |
34 | 34 | gunzip -cd $DOCBOOK_XSL_TARBALL | tar xf - |
35 | 35 | echo "done." |
36 | 36 | fi |
… |
… |
fi
|
47 | 47 | |
48 | 48 | DOCBOOK_DTD_DIR="$PWD/docbook-dtd-$DOCBOOK_DTD_VERSION" |
49 | 49 | if test ! -d docbook-dtd-$DOCBOOK_DTD_VERSION; then |
50 | | echo -n "Expanding DocBook XML DTD into $DOCBOOK_DTD_DIR... " |
| 50 | printf %s "Expanding DocBook XML DTD into $DOCBOOK_DTD_DIR... " |
51 | 51 | unzip -q $DOCBOOK_DTD_ZIP -d $DOCBOOK_DTD_DIR |
52 | 52 | echo "done." |
53 | 53 | fi |
… |
… |
else
|
114 | 114 | fi |
115 | 115 | |
116 | 116 | if test ! -d $FOP_DIR; then |
117 | | echo -n "Expanding FOP distribution into $FOP_DIR... "; |
| 117 | printf %s "Expanding FOP distribution into $FOP_DIR... "; |
118 | 118 | gunzip -cd $FOP_TARBALL | tar xf - |
119 | 119 | echo "done."; |
120 | 120 | fi |
… |
… |
if test -r "$HOME/user-config.jam"; then
|
127 | 127 | JAM_CONFIG_IN="user-config-backup.jam" |
128 | 128 | cp $JAM_CONFIG_OUT user-config-backup.jam |
129 | 129 | JAM_CONFIG_IN_TEMP="yes" |
130 | | echo -n "Updating Boost.Jam configuration in $JAM_CONFIG_OUT... " |
| 130 | printf %s "Updating Boost.Jam configuration in $JAM_CONFIG_OUT... " |
131 | 131 | |
132 | 132 | elif test -r "$BOOST_ROOT/tools/build/v2/user-config.jam"; then |
133 | 133 | JAM_CONFIG_IN="$BOOST_ROOT/tools/build/v2/user-config.jam"; |
134 | 134 | JAM_CONFIG_IN_TEMP="no" |
135 | | echo -n "Writing Boost.Jam configuration to $JAM_CONFIG_OUT... " |
| 135 | printf %s "Writing Boost.Jam configuration to $JAM_CONFIG_OUT... " |
136 | 136 | else |
137 | 137 | echo "ERROR: Please set the BOOST_ROOT environment variable to refer to your" |
138 | 138 | echo "Boost installation or copy user-config.jam into your home directory." |
diff --git i/tools/build/v2/bootstrap.sh w/tools/build/v2/bootstrap.sh
index 5083551..c3a7eec 100755
i
|
w
|
rm -f config.log
|
94 | 94 | |
95 | 95 | # Build bjam |
96 | 96 | if test "x$BJAM" = x; then |
97 | | echo -n "Bootstrapping the build engine with toolset $TOOLSET... " |
| 97 | printf %s "Bootstrapping the build engine with toolset $TOOLSET... " |
98 | 98 | pwd=`pwd` |
99 | 99 | (cd "$my_dir/engine" && ./build.sh "$TOOLSET") > bootstrap.log 2>&1 |
100 | 100 | if [ $? -ne 0 ]; then |