--- toast 2003/12/04 07:03:43 1.259
+++ toast 2003/12/06 21:20:06 1.260
@@ -1043,6 +1043,21 @@
##############################################################################
+sub findperl()
+{
+ if($^X !~ m!/!) # 5.8.2 doesn't need all this, but 5.6.1 seems to
+ {
+ for(split(/:/, $ENV{"PATH"}))
+ {
+ my($path) = path($_, $^X);
+ return $path if -x($path);
+ }
+ }
+ return abspath($^X);
+}
+
+##############################################################################
+
sub yes()
{
explain("forking yes subprocess");
@@ -1059,7 +1074,7 @@
explain("$myname $myversion building " . pkgname($name, $version, $build));
explain("$^X $0 $] $^O");
optrun("uname", "-a");
- optrun($^X, "-V");
+ optrun(findperl, "-V");
optrun("printenv");
my(@urls) = pkgurls($name, $version);
explain("url: $_") for @urls;
@@ -1813,7 +1828,7 @@
{
my($srcdir, $rootdir, $helperdir, $cmd, $force) = @_;
helpstub($helperdir, $cmd);
- my($perl) = abspath($^X);
+ my($perl) = findperl;
error("can't find perl: $perl") unless -x($perl);
writescript(path($helperdir, "$cmd.helper"), "#!$perl\n# $genby\n", q[
$cmd = ], quote($cmd), q[;