Merge pull request #1246 from SaberUK/master+perl

Update build system for the removal of . from @INC.

3 files changed, 6 insertions, 1 deletions

diff --git a/configure b/configure
index a384be081..b81a7809a 100755
--- a/configure
+++ b/configure
@@ -37,9 +37,11 @@ use warnings FATAL => qw(all);
 use File::Basename        qw(basename);
 use File::Copy            ();
 use File::Spec::Functions qw(rel2abs);
+use FindBin               qw($RealDir);
 use Getopt::Long          qw(GetOptions);
 use POSIX                 qw(getgid getuid);
 
+use lib $RealDir;
 use make::common;
 use make::configure;
 use make::console;
diff --git a/tools/genssl b/tools/genssl
index c88f9534f..b824f4ebe 100755
--- a/tools/genssl
+++ b/tools/genssl
@@ -36,7 +36,7 @@ use File::Temp();
 
 sub prompt($$) {
 	my ($question, $default) = @_;
-	return prompt_string(1, $question, $default) if eval 'use make::console; 1';
+	return prompt_string(1, $question, $default) if eval 'use FindBin;use lib $FindBin::RealDir;use make::console; 1';
 	say $question;
 	print "[$default] => ";
 	chomp(my $answer = <STDIN>);
diff --git a/tools/test-build b/tools/test-build
index 17c98042b..2b9ee4ee2 100755
--- a/tools/test-build
+++ b/tools/test-build
@@ -30,6 +30,9 @@ use feature ':5.10';
 use strict;
 use warnings FATAL => qw(all);
 
+use FindBin qw($RealDir);
+
+use lib $RealDir;
 use make::common;
 use make::configure;