Commit 011b3b84 authored by Simon Marlow's avatar Simon Marlow

Use /usr/bin/test if it exists, and fix test syntax.

Should fix Solaris build failures
parent bc65cfb2
......@@ -51,6 +51,11 @@ include mk/custom-settings.mk
# No need to update makefiles for these targets:
REALGOALS=$(filter-out bootstrapping-files framework-pkg clean clean_% distclean maintainer-clean show help,$(MAKECMDGOALS))
# On Solaris, the builtin test doesn't support -nt, you have to use
# /usr/bin/test. On MSYS, however, /usr/bin/test does not exist. How
# nice.
TEST=$(if $(wildcard /usr/bin/test),/usr/bin/test,test)
# configure touches certain files even if they haven't changed. This
# can mean a lot of unnecessary recompilation after a re-configure, so
# here we cache the old versions of these files so we can restore the
......@@ -58,12 +63,12 @@ REALGOALS=$(filter-out bootstrapping-files framework-pkg clean clean_% distclean
#
define check-configure-file
# $1 = file
if ! test -f $1.old; then \
if $(TEST) ! -f $1.old; then \
echo "backing up $1"; \
cp $1 $1.old; \
touch -r $1 $1.old; \
else \
if test $1 -nt $1.old; then \
if $(TEST) $1 -nt $1.old; then \
if cmp $1 $1.old; then \
echo "$1 has been touched, but has not changed"; \
touch -r $1.old $1; \
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment