From f2d4be3b84dd38e12dadeba055b28374d56ab1a1 Mon Sep 17 00:00:00 2001 From: Ben Laurie Date: Mon, 28 Dec 1998 22:05:44 +0000 Subject: [PATCH] Make Configure work again after eliminating files. --- Configure | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/Configure b/Configure index d54eb521b..91b3404b8 100755 --- a/Configure +++ b/Configure @@ -2,6 +2,7 @@ require 5.000; use strict; +use POSIX qw(:errno_h); # # see PROBLEMS for instructions on what sort of things to do when @@ -326,9 +327,8 @@ if ($rmd160_obj =~ /\.o$/) $cflags.=" -DRMD160_ASM"; } -my $n=&file_new($Makefile); -open(IN,'".$n) || die "unable to read $n:$!\n"; +open(IN,'$Makefile") || die "unable to create $Makefile:$!\n"; while () { chop; @@ -349,8 +349,7 @@ while () } close(IN); close(OUT); -&Rename($Makefile,&file_old($Makefile)); -&Rename($n,$Makefile); + print "CC =$cc\n"; print "CFLAG =$cflags\n"; print "EX_LIBS =$lflags\n"; @@ -408,7 +407,7 @@ foreach (sort split(/\s+/,$bn_ops)) } ((my $in=$bn) =~ s/\.([^.]+)/.$postfix/); -$n=&file_new($bn); +my $n=&file_new($bn); open(IN,"<".$in) || die "unable to read $bn:$!\n"; open(OUT,">$n") || die "unable to read $n:$!\n"; while () @@ -610,7 +609,10 @@ sub Rename my($from,$to)=@_; unlink($to); - rename($from,$to) || die "unable to rename $from to $to:$!\n"; + if(!rename($from,$to)) + { + POSIX::errno() == POSIX::ENOENT || die "unable to rename $from to $to:$!\n"; + } } sub file_new { local($a)=@_; $a =~ s/(\.[^.]+$|$)/.new/; $a; }