diff options
Diffstat (limited to 'util')
| -rwxr-xr-x | util/mk1mf.pl | 5 | ||||
| -rw-r--r-- | util/pl/unix.pl | 15 | ||||
| -rwxr-xr-x | util/ranlib.sh | 23 | ||||
| -rwxr-xr-x | util/sep_lib.sh | 3 |
4 files changed, 14 insertions, 32 deletions
diff --git a/util/mk1mf.pl b/util/mk1mf.pl index 11f8a934b6..2bf9584ce5 100755 --- a/util/mk1mf.pl +++ b/util/mk1mf.pl @@ -234,11 +234,6 @@ else { $cflags="$c_flags$cflags" if ($c_flags ne ""); } $ex_libs="$l_flags$ex_libs" if ($l_flags ne ""); -if ($ranlib ne "") - { - $ranlib="\$(SRC_D)$o$ranlib"; - } - if ($msdos) { $banner ="\t\@echo Make sure you have run 'perl Configure $platform' in the\n"; diff --git a/util/pl/unix.pl b/util/pl/unix.pl index aa2d7d1f37..146611ad99 100644 --- a/util/pl/unix.pl +++ b/util/pl/unix.pl @@ -38,7 +38,7 @@ $ex_libs=""; # static library stuff $mklib='ar r'; $mlflags=''; -$ranlib='util/ranlib.sh'; +$ranlib=&which("ranlib") or $ranlib="true"; $plib='lib'; $libp=".a"; $shlibp=".a"; @@ -80,4 +80,17 @@ sub do_link_rule return($ret); } +sub which + { + my ($name)=@_; + my $path; + foreach $path (split /:/, $ENV{PATH}) + { + if (-x "$path/$name") + { + return "$path/$name"; + } + } + } + 1; diff --git a/util/ranlib.sh b/util/ranlib.sh deleted file mode 100755 index 543f712c6b..0000000000 --- a/util/ranlib.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/sh - -cwd=`pwd` -cd /tmp - -if [ -s /bin/ranlib ] ; then - RL=/bin/ranlib -else if [ -s /usr/bin/ranlib ] ; then - RL=/usr/bin/ranlib -fi -fi - -if [ "x$RL" != "x" ] -then - case "$1" in - /*) - $RL "$1" - ;; - *) - $RL "$cwd/$1" - ;; - esac -fi diff --git a/util/sep_lib.sh b/util/sep_lib.sh index 2348db874e..34c2c9f8ba 100755 --- a/util/sep_lib.sh +++ b/util/sep_lib.sh @@ -21,9 +21,6 @@ do /bin/rm -f *.old /bin/mv Makefile.uni Makefile - cp $cwd/util/ranlib.sh . - chmod +x ranlib.sh - if [ -d asm ]; then mkdir asm/perlasm cp $cwd/crypto/perlasm/*.pl asm/perlasm |