Commit 5902821d authored by Richard Levitte's avatar Richard Levitte
Browse files

Make the use of perl more consistent 



- In Configure, register the perl interpreter used to run Configure,
  so that's the one being used throughout instead of something else
  that Configure happens to find.  This is helpful for using a perl
  version that's not necessarely first in $PATH:

    /opt/perl/5.22.1/bin/perl ./Configure

- Make apps/tsget a generated file, just like apps/CA.pl, so the
  perl interpreter registered by Configure becomes the hashbang path
  instead of a hardcoded /usr/bin/perl

Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
parent 475965f2

Configurations/unix-Makefile.tmpl

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ GENERATED={- join(" ", map { (my $x = $_) =~ s|\.S$|\.s|; $x } keys %{$unified_i 
BIN_SCRIPTS=$(BLDDIR)/tools/c_rehash

MISC_SCRIPTS=$(SRCDIR)/tools/c_hash $(SRCDIR)/tools/c_info \

	     $(SRCDIR)/tools/c_issuer $(SRCDIR)/tools/c_name \

	     $(BLDDIR)/apps/CA.pl $(SRCDIR)/apps/tsget

	     $(BLDDIR)/apps/CA.pl $(BDLDIR)/apps/tsget



SHLIB_INFO={- join(" ", map { "\"".shlib($_).";".shlib_simple($_)."\"" } @{$unified_info{libraries}}) -}

Configure

+1 −1
Original line number Diff line number Diff line
@@ -875,7 +875,7 @@ $config{cross_compile_prefix} = $ENV{'CROSS_COMPILE'} 
    if $config{cross_compile_prefix} eq "";



# Allow overriding the names of some tools.  USE WITH CARE

$config{perl} =    $ENV{'PERL'}    || which("perl5") || which("perl") || "perl";

$config{perl} =    $ENV{'PERL'}    || ($^O ne "VMS" ? $^X : "perl");

$target{cc} =      $ENV{'CC'}      || $target{cc}      || "cc";

$target{ranlib} =  $ENV{'RANLIB'}  || $target{ranlib}  || which("ranlib") || "true";

$target{ar} =      $ENV{'AR'}      || $target{ar}      || "ar";

apps/build.info

+2 −1
Original line number Diff line number Diff line
@@ -14,5 +14,6 @@ SOURCE[openssl]=\ 
INCLUDE[openssl]={- rel2abs(catdir($builddir,"../include")) -} .. ../include

DEPEND[openssl]=../libssl



SCRIPTS=CA.pl

SCRIPTS=CA.pl tsget

SOURCE[CA.pl]=CA.pl.in

SOURCE[tsget]=tsget.in

apps/tsget→apps/tsget.in

+1 −1
Original line number Diff line number Diff line 
#!/usr/bin/perl -w

#!{- $config{perl} -}

# Written by Zoltan Glozik <zglozik@stones.com>.

# Copyright (c) 2002 The OpenTSA Project.  All rights reserved.

$::version = '$Id: tsget,v 1.3 2009/09/07 17:57:18 steve Exp $';