diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-01-30 00:03:58 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-09 11:43:19 +0100 |
| commit | d7465918867b107058228938e7f5c9fa032ef708 (patch) | |
| tree | 3deaa3302c111c7d82dcbd03df13682c607e091c /util | |
| parent | f83133a5ed9757668c12d78256ab91c2ef78a921 (diff) | |
| download | openssl-d7465918867b107058228938e7f5c9fa032ef708.zip openssl-d7465918867b107058228938e7f5c9fa032ef708.tar.gz openssl-d7465918867b107058228938e7f5c9fa032ef708.tar.bz2 | |
unified build scheme: adjust some scripts
util/mkdef.pl and Makefile.shared needs to know about the source and
the build directories.
Additionally, Makefile.shared needs to know how to build shared
libraries in a directory other than the current one.
Reviewed-by: Ben Laurie <ben@openssl.org>
Diffstat (limited to 'util')
| -rwxr-xr-x | util/mkdef.pl | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/util/mkdef.pl b/util/mkdef.pl index 3151800..ff68d86 100755 --- a/util/mkdef.pl +++ b/util/mkdef.pl @@ -40,11 +40,12 @@ use lib "."; use configdata; +use File::Spec::Functions; my $debug=0; -my $crypto_num= "util/libeay.num"; -my $ssl_num= "util/ssleay.num"; +my $crypto_num= catfile($config{sourcedir},"util","libeay.num"); +my $ssl_num= catfile($config{sourcedir},"util","ssleay.num"); my $libname; my $do_update = 0; @@ -384,8 +385,9 @@ sub do_defs foreach $file (split(/\s+/,$symhacksfile." ".$files)) { - print STDERR "DEBUG: starting on $file:\n" if $debug; - open(IN,"<$file") || die "unable to open $file:$!\n"; + my $fn = catfile($config{sourcedir},$file); + print STDERR "DEBUG: starting on $fn:\n" if $debug; + open(IN,"<$fn") || die "unable to open $fn:$!\n"; my $line = "", my $def= ""; my %tag = ( (map { $_ => 0 } @known_platforms), @@ -1552,7 +1554,8 @@ sub count_parens #version sub get_openssl_version() { - open (IN, "include/openssl/opensslv.h") || die "Can't open opensslv.h"; + my $fn = catfile($config{sourcedir},"include","openssl","opensslv.h"); + open (IN, "$fn") || die "Can't open opensslv.h"; while(<IN>) { if (/OPENSSL_VERSION_TEXT\s+"OpenSSL (\d\.\d\.)(\d[a-z]*)(-| )/) { |