summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xconfigure2
-rw-r--r--ct-ng.in8
2 files changed, 9 insertions, 1 deletions
diff --git a/configure b/configure
index d7bb471..d72c50d 100755
--- a/configure
+++ b/configure
@@ -125,7 +125,7 @@ fi
[ -x /bin/bash ] || do_error "bash 3.0 or above was not found in /bin/bash"
bash_version=$(/bin/bash -c 'echo ${BASH_VERSION}')
bash_major=$(/bin/bash -c 'echo ${BASH_VERSINFO[0]}')
-[ ${bash_major} -ge 3 ] || do_error "bash 3.0 or above is needed (found ${bash_version})"
+[ ${bash_major} -ge 3 ] || do_error "bash 3.0 or above is needed (/bin/bash is ${bash_version})"
sed -r -e "s,@@BINDIR@@,${BINDIR},g;" \
-e "s,@@LIBDIR@@,${LIBDIR},g;" \
diff --git a/ct-ng.in b/ct-ng.in
index 050e1c0..d1a4bee 100644
--- a/ct-ng.in
+++ b/ct-ng.in
@@ -3,8 +3,16 @@
# Copyright 2006 Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
# Don't print directory as we descend into them
+# Don't use built-in rules, we know what we're doing
MAKEFLAGS += --no-print-directory --no-builtin-rules
+# Some distributions (eg. Ubuntu) thought it wise to point /bin/sh to
+# a truly POSIX-conforming shell, ash in this case. This is not so good
+# as we, smart (haha!) developers (as smart we ourselves think we are),
+# got used to bashisms, and are enclined to easiness... So force use of
+# bash. (Note: this is ugly, but ./configure checks for it).
+export SHELL=/bin/bash
+
# This is where ct-ng is.
# Don't bother to change it other than with a new ./configure!
CT_NG:=@@CT_BINDIR@@/ct-ng