From bf1ca571c83e5bfd37cefb8baee80adaf73a9c70 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sat, 5 Dec 2009 14:39:15 +0100 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ automake.in | 2 +- bootstrap | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 496312932..feca8dbb7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-12-05 Ralf Wildenhues + 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 871c98eeb..e934c5fef 100755 --- 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 fff40d55e..2a86345db 100755 --- 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 -- 2.47.2