Use $DJDIR rather than $DJGPP to detect running on DJGPP.

* automake.in (Language): Use $ENV{'DJDIR'} for the
$ENV{'SHELL'} override.
* bootstrap: Use $DJDIR for setting BOOTSTRAP_SHELL, to fix
bootstrapping under MinGW when $DJGPP has been set.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>

diff --git a/ChangeLog b/ChangeLog
index 4963129..feca8db 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-12-05  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Use $DJDIR rather than $DJGPP to detect running on DJGPP.
+       * automake.in (Language): Use $ENV{'DJDIR'} for the
+       $ENV{'SHELL'} override.
+       * bootstrap: Use $DJDIR for setting BOOTSTRAP_SHELL, to fix
+       bootstrapping under MinGW when $DJGPP has been set.
+
        Do not rely on Perl symlink status, for MSYS perl.
        * automake.in (require_file_internal): Ensure presence of
        symlink target file; MSYS perl symlink doesn't return an error

diff --git a/automake.in b/automake.in
index 871c98e..e934c5f 100755 (executable)
--- a/automake.in
+++ b/automake.in
@@ -41,7 +41,7 @@ BEGIN
   # it turns up other systems need the same thing.  After all,
   # if SHELL is used, ./configure's SHELL is always better than
   # the user's SHELL (which may be something like tcsh).
-  $ENV{'SHELL'} = '@SHELL@' if exists $ENV{'DJGPP'};
+  $ENV{'SHELL'} = '@SHELL@' if exists $ENV{'DJDIR'};
 }
 
 use Automake::Struct;

diff --git a/bootstrap b/bootstrap
index fff40d5..2a86345 100755 (executable)
--- a/bootstrap
+++ b/bootstrap
@@ -61,7 +61,7 @@ PERL_THREADS=0
 # Override SHELL.  This is required on DJGPP so that Perl's system()
 # uses bash, not COMMAND.COM which doesn't quote arguments properly.
 # It's not used otherwise.
-if test -n "$DJGPP"; then
+if test -n "$DJDIR"; then
     BOOTSTRAP_SHELL=/dev/env/DJDIR/bin/bash.exe
 else
     BOOTSTRAP_SHELL=/bin/sh