diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-31 09:27:15 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-04-01 07:24:04 +0200 |
| commit | 5902821d81ced5e7c5db972e4b569848500940f7 (patch) | |
| tree | 870bfa988b1416a7f27f05b045521d98d7aa1388 | |
| parent | 475965f2ef8eaeb67f065a7eabd3a781da76305b (diff) | |
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: Andy Polyakov <appro@openssl.org>
| -rw-r--r-- | Configurations/unix-Makefile.tmpl | 2 | ||||
| -rwxr-xr-x | Configure | 2 | ||||
| -rw-r--r-- | apps/build.info | 3 | ||||
| -rw-r--r-- | apps/tsget.in (renamed from apps/tsget) | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 67b13fa2db..bd02b8c3c2 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -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}}) -} @@ -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"; diff --git a/apps/build.info b/apps/build.info index d581aad4bf..d8ad19702c 100644 --- a/apps/build.info +++ b/apps/build.info @@ -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 diff --git a/apps/tsget b/apps/tsget.in index da900d98a1..fe029f353a 100644 --- a/apps/tsget +++ b/apps/tsget.in @@ -1,4 +1,4 @@ -#!/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 $'; |