projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Update from 0.9.7-stable.
[oweals/openssl.git]
/
util
/
pl
/
unix.pl
diff --git
a/util/pl/unix.pl
b/util/pl/unix.pl
index 36311711c64bea6a29cfae45449fc5c19a3b150d..146611ad99586edac881f7f199a745271130850f 100644
(file)
--- a/
util/pl/unix.pl
+++ b/
util/pl/unix.pl
@@
-38,7
+38,7
@@
$ex_libs="";
# static library stuff
$mklib='ar r';
$mlflags='';
# static library stuff
$mklib='ar r';
$mlflags='';
-$ranlib=
'util/ranlib.sh'
;
+$ranlib=
&which("ranlib") or $ranlib="true"
;
$plib='lib';
$libp=".a";
$shlibp=".a";
$plib='lib';
$libp=".a";
$shlibp=".a";
@@
-46,8
+46,8
@@
$lfile='';
$asm='as';
$afile='-o ';
$asm='as';
$afile='-o ';
-$bn_
mulw
_obj="";
-$bn_
mulw
_src="";
+$bn_
asm
_obj="";
+$bn_
asm
_src="";
$des_enc_obj="";
$des_enc_src="";
$bf_enc_obj="";
$des_enc_obj="";
$des_enc_src="";
$bf_enc_obj="";
@@
-59,7
+59,7
@@
sub do_lib_rule
local($ret,$_,$Name);
$target =~ s/\//$o/g if $o ne '/';
local($ret,$_,$Name);
$target =~ s/\//$o/g if $o ne '/';
- $target="
\$(LIB_D)$o
$target";
+ $target="$target";
($Name=$name) =~ tr/a-z/A-Z/;
$ret.="$target: \$(${Name}OBJ)\n";
($Name=$name) =~ tr/a-z/A-Z/;
$ret.="$target: \$(${Name}OBJ)\n";
@@
-80,4
+80,17
@@
sub do_link_rule
return($ret);
}
return($ret);
}
+sub which
+ {
+ my ($name)=@_;
+ my $path;
+ foreach $path (split /:/, $ENV{PATH})
+ {
+ if (-x "$path/$name")
+ {
+ return "$path/$name";
+ }
+ }
+ }
+
1;
1;