summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortruelight <truelight@openttd.org>2007-03-27 13:56:18 +0000
committertruelight <truelight@openttd.org>2007-03-27 13:56:18 +0000
commitc738cdc0f0bbe21dc5551cc5d5e7979682efa533 (patch)
tree350e22bf52bdcbde6f76b3ba9dd82d89baaf227d
parentc25d539543dd1c83014223a1ab02d5c47b48b222 (diff)
downloadopenttd-c738cdc0f0bbe21dc5551cc5d5e7979682efa533.tar.xz
(svn r9504) [Config] -Fix r9340: somehow a -n got mixed up with a -z (tnx glx)
-rwxr-xr-xconfigure5
1 files changed, 4 insertions, 1 deletions
diff --git a/configure b/configure
index 3e96ae645..8ec90b75a 100755
--- a/configure
+++ b/configure
@@ -3,7 +3,10 @@
CONFIGURE_EXECUTABLE="$_"
# On *nix systems those two are equal when ./configure is done
if [ "$0" != "$CONFIGURE_EXECUTABLE" ]; then
- if [ -z "`echo $CONFIGURE_EXECUTABLE | grep make`" ]; then
+ # On some systems, when ./configure is triggered from 'make'
+ # the $_ is filled with 'make'. So if that is true, skip 'make'
+ # and use $0 (and hope that is correct ;))
+ if [ -n "`echo $CONFIGURE_EXECUTABLE | grep make`" ]; then
CONFIGURE_EXECUTABLE="$0"
else
CONFIGURE_EXECUTABLE="$CONFIGURE_EXECUTABLE $0"