diff options
Diffstat (limited to 'tests/scripts/functions')
| -rw-r--r-- | tests/scripts/functions/foreach | 2 | ||||
| -rw-r--r-- | tests/scripts/functions/origin | 11 |
2 files changed, 7 insertions, 6 deletions
diff --git a/tests/scripts/functions/foreach b/tests/scripts/functions/foreach index 0c63c47..b80751b 100644 --- a/tests/scripts/functions/foreach +++ b/tests/scripts/functions/foreach @@ -20,7 +20,7 @@ open(MAKEFILE,"> $makefile"); # On WIN32 systems, the user's path is found in %Path% ($Path) # -$pathvar = (($osname =~ /Windows/i) ? "Path" : "PATH"); +$pathvar = (($port_type eq 'Windows') ? "Path" : "PATH"); print MAKEFILE <<EOF; foo = bletch null \@ garf diff --git a/tests/scripts/functions/origin b/tests/scripts/functions/origin index 721d928..eab2d78 100644 --- a/tests/scripts/functions/origin +++ b/tests/scripts/functions/origin @@ -15,12 +15,13 @@ defined per the following list: 'override' defined by override in makefile 'automatic' Automatic variable\n"; -# On WIN32 systems, HOME is meaningless. SystemRoot should be defined though. -# With DJGPP, HOME is not guaranteed to be defined. Use DJDIR instead. +# On WIN32 systems, HOME is meaningless. SystemRoot should be defined +# though. With DJGPP, HOME is not guaranteed to be defined. Use DJDIR +# instead. # -$homevar = (($osname =~ /Windows/i) - ? "SystemRoot" - : (($osname =~ /DOS/i) ? "DJDIR" : "HOME")); +$homevar = (($port_type eq 'Windows') ? "SystemRoot" + : (($port_type eq 'DOS') ? "DJDIR" + : "HOME")); open(MAKEFILE,"> $makefile"); |