Commit c2aa4f20 authored by Richard Levitte's avatar Richard Levitte
Browse files

For those wanting to build for several platforms with the same source 

directory, making a separate directory tree with lots of symbolic links
seems to be the solution.  Unfortunatelt, Configure doesn't take appropriate
steps to support this solution (as in removing a file that's going to be
rewritten).  This change corrects that situation.  Now I just have to
find all other places where there's lack of support for this.
parent b23f50e6

Configure

+8 −2
Original line number Original line Diff line number Diff line
@@ -1170,7 +1170,8 @@ if ($shlib_version_number =~ /(^[0-9]*)\.([0-9\.]*)/) 
	}

	}





open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";

open(IN,'<Makefile.org') || die "unable to read Makefile.org:$!\n";

open(OUT,">$Makefile") || die "unable to create $Makefile:$!\n";

unlink("$Makefile.new") || die "unable to remove old $Makefile.new:$!\n" if -e "$Makefile.new";

open(OUT,">$Makefile.new") || die "unable to create $Makefile.new:$!\n";

print OUT "### Generated automatically from Makefile.org by Configure.\n\n";

print OUT "### Generated automatically from Makefile.org by Configure.\n\n";

my $sdirs=0;

my $sdirs=0;

while (<IN>)

while (<IN>)
@@ -1244,6 +1245,8 @@ while (<IN>) 
	}

	}

close(IN);

close(IN);

close(OUT);

close(OUT);

rename($Makefile,"$Makefile.bak") || die "unable to rename $Makefile\n" if -e $Makefile;

rename("$Makefile.new",$Makefile) || die "unable to rename $Makefile.new\n";





print "CC            =$cc\n";

print "CC            =$cc\n";

print "CFLAG         =$cflags\n";

print "CFLAG         =$cflags\n";
@@ -1314,7 +1317,8 @@ foreach (sort split(/\s+/,$bn_ops)) 
	}

	}





open(IN,'<crypto/opensslconf.h.in') || die "unable to read crypto/opensslconf.h.in:$!\n";

open(IN,'<crypto/opensslconf.h.in') || die "unable to read crypto/opensslconf.h.in:$!\n";

open(OUT,'>crypto/opensslconf.h') || die "unable to create crypto/opensslconf.h:$!\n";

unlink("crypto/opensslconf.h.new") || die "unable to remove old crypto/opensslconf.h.new:$!\n" if -e "crypto/opensslconf.h.new";

open(OUT,'>crypto/opensslconf.h.new') || die "unable to create crypto/opensslconf.h.new:$!\n";

print OUT "/* opensslconf.h */\n";

print OUT "/* opensslconf.h */\n";

print OUT "/* WARNING: Generated automatically from opensslconf.h.in by Configure. */\n\n";

print OUT "/* WARNING: Generated automatically from opensslconf.h.in by Configure. */\n\n";
@@ -1408,6 +1412,8 @@ while (<IN>) 
	}

	}

close(IN);

close(IN);

close(OUT);

close(OUT);

rename("crypto/opensslconf.h","crypto/opensslconf.h.bak") || die "unable to rename crypto/opensslconf.h\n" if -e "crypto/opensslconf.h";

rename("crypto/opensslconf.h.new","crypto/opensslconf.h") || die "unable to rename crypto/opensslconf.h.new\n";









# Fix the date

# Fix the date