diff --recursive --unified PDL-2.4.0.orig/Basic/Core/Dev.pm PDL-2.4.0/Basic/Core/Dev.pm --- PDL-2.4.0.orig/Basic/Core/Dev.pm 2003-04-04 15:25:09.000000000 -0800 +++ PDL-2.4.0/Basic/Core/Dev.pm 2003-12-01 20:13:51.000000000 -0800 @@ -595,9 +595,7 @@ my $HIDE = ($^O =~ /MSWin/) || !$hide ? '' : '>/dev/null 2>&1'; my $td = $^O =~ /MSWin/ ? 'TEMP' : 'tmp'; - my $tempd = defined $ENV{TEMP} ? $ENV{TEMP} : - defined $ENV{TMP} ? $ENV{TMP} : - &$cdir($fs->rootdir,$td); + my $tempd = defined $ENV{TMP} ? $ENV{TMP} : &$cdir($fs->rootdir,$td); my ($tc,$te) = map {&$cfile($tempd,"testfile$_")} ('.c',''); open FILE,">$tc" or die "couldn't open testfile `$tc' for writing"; diff --recursive --unified PDL-2.4.0.orig/Basic/Math/Makefile.PL PDL-2.4.0/Basic/Math/Makefile.PL --- PDL-2.4.0.orig/Basic/Math/Makefile.PL 2002-11-19 16:15:01.000000000 -0800 +++ PDL-2.4.0/Basic/Math/Makefile.PL 2003-12-01 20:15:06.000000000 -0800 @@ -102,9 +102,7 @@ $dir = $fs->canonpath(cwd); $dir = cdir $dir, $mdir unless $dir =~ /$mmdir$/; $td = $^O =~ /MSWin/ ? 'TEMP' : 'tmp'; -$tempd = defined $ENV{TEMP} ? $ENV{TEMP} : - defined $ENV{TMP} ? $ENV{TMP} : - cdir($fs->rootdir,$td); +$tempd = defined $ENV{TMP} ? $ENV{TMP} : cdir($fs->rootdir,$td); foreach (@sfuncs) { $source{$_} = 'system' if is_sys_func( "$_();", $libs ); diff --recursive --unified PDL-2.4.0.orig/Basic/MatrixOps/Makefile.PL PDL-2.4.0/Basic/MatrixOps/Makefile.PL --- PDL-2.4.0.orig/Basic/MatrixOps/Makefile.PL 2002-11-19 18:18:44.000000000 -0800 +++ PDL-2.4.0/Basic/MatrixOps/Makefile.PL 2003-12-01 20:15:45.000000000 -0800 @@ -89,9 +89,7 @@ $dir = $fs->canonpath(cwd); $dir = cdir $dir, $mdir unless $dir =~ /$mmdir$/; $td = $^O =~ /MSWin/ ? 'TEMP' : 'tmp'; -$tempd = defined $ENV{TEMP} ? $ENV{TEMP} : - defined $ENV{TMP} ? $ENV{TMP} : - cdir($fs->rootdir,$td); +$tempd = defined $ENV{TMP} ? $ENV{TMP} : cdir($fs->rootdir,$td); foreach (@sfuncs) { $source{$_} = 'system' if is_sys_func( "$_();", $libs ); diff --recursive --unified PDL-2.4.0.orig/Graphics/TriD/TriD/VRML.pm PDL-2.4.0/Graphics/TriD/TriD/VRML.pm --- PDL-2.4.0.orig/Graphics/TriD/TriD/VRML.pm 2000-08-08 04:18:48.000000000 -0700 +++ PDL-2.4.0/Graphics/TriD/TriD/VRML.pm 2003-12-01 22:33:23.000000000 -0800 @@ -536,8 +536,7 @@ $this->{'Type'} = $types{$mime}; &{$this->{'Type'}->{'setup'}} if defined $this->{'Type'}->{'setup'}; $this->{'Binding'} = 'local'; - $this->{'Filestem'} = ($ENV{'TMP'} || $ENV{'TEMP'} || '/tmp') . - "/tridim_$urlnum"; $urlnum++; + $this->{'Filestem'} = ($ENV{'TMP'} || '/tmp') . "/tridim_$urlnum"; $urlnum++; return $this; } @@ -565,7 +564,7 @@ }; # set up the default parameters for VRML -my $tmpdir = $ENV{'TMP'} || $ENV{'TEMP'} || '/tmp'; +my $tmpdir = $ENV{'TMP'} || '/tmp'; my $tmpname = "$tmpdir/tridvrml_$$.wrl"; my $para = $PDL::Graphics::TriD::Settings = PDL::Graphics::TriD::VRML::Parameter->new() ; diff --recursive --unified PDL-2.4.0.orig/IO/Pnm/Pic.pm PDL-2.4.0/IO/Pnm/Pic.pm --- PDL-2.4.0.orig/IO/Pnm/Pic.pm 2003-02-01 21:22:40.000000000 -0800 +++ PDL-2.4.0/IO/Pnm/Pic.pm 2003-12-01 20:07:06.000000000 -0800 @@ -767,7 +767,6 @@ # are there already VMS or Windows NT/95 users ? my $tmpdir = '/tmp'; $tmpdir = $ENV{"TMP"} if defined $ENV{"TMP"}; - $tmpdir = $ENV{"TEMP"} if defined $ENV{"TEMP"}; $tmpdir =~ s|/$||; # chop off a trailing '/' barf "can't locate a temp dir" unless -d $tmpdir; return $tmpdir; diff --recursive --unified PDL-2.4.0.orig/IO/Pnm/pnm.pd PDL-2.4.0/IO/Pnm/pnm.pd --- PDL-2.4.0.orig/IO/Pnm/pnm.pd 2001-01-21 01:24:08.000000000 -0800 +++ PDL-2.4.0/IO/Pnm/pnm.pd 2003-12-01 20:13:06.000000000 -0800 @@ -73,7 +73,7 @@ # in the future an os indep. way # are there already VMS or Windows NT/95 users ? my $tmpdir = '/tmp'; - for ('TMP','TEMP','TMPDIR') { + for ('TMP','TMPDIR') { $tmpdir = $ENV{$_} if defined $ENV{$_}; } $tmpdir =~ s|/$||; # chop off a trailing '/' diff --recursive --unified PDL-2.4.0.orig/t/misc.t PDL-2.4.0/t/misc.t --- PDL-2.4.0.orig/t/misc.t 2002-05-13 14:29:48.000000000 -0700 +++ PDL-2.4.0/t/misc.t 2003-12-01 20:10:53.000000000 -0800 @@ -30,9 +30,7 @@ sub cdir { return $fs->catdir(@_)} sub cfile { return $fs->catfile(@_)} $td = $^O =~ /MSWin/ ? 'TEMP' : 'tmp'; -$tempd = defined $ENV{TEMP} ? $ENV{TEMP} : - defined $ENV{TMP} ? $ENV{TMP} : - cdir($fs->rootdir,$td); +$tempd = defined $ENV{TMP} ? $ENV{TMP} : cdir($fs->rootdir,$td); $file = cfile $tempd, "iotest$$"; ############# Test rcols with filename and pattern #############