Consolidate the locations where we have our internal perl modules

Instead of having perl modules under test/testlib and util,
consolidate them all to be inside util/perl.

(this is an adaptation of the part of #4069 that wasn't included in #4666)

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4667)

1 files changed, 2 insertions, 2 deletions

diff --git a/Configure b/Configure
index 5b235fe39e..3d4b2cd347 100755
--- a/Configure
+++ b/Configure
@@ -12,7 +12,7 @@
 use 5.10.0;
 use strict;
 use FindBin;
-use lib "$FindBin::Bin/util";
+use lib "$FindBin::Bin/util/perl";
 use File::Basename;
 use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs/;
 use File::Path qw/mkpath/;
@@ -1481,7 +1481,7 @@ if ($builder eq "unified") {
         my $template =
             Text::Template->new(TYPE => 'FILE',
                                 SOURCE => catfile($sourced, $f),
-                                PREPEND => qq{use lib "$FindBin::Bin/util";});
+                                PREPEND => qq{use lib "$FindBin::Bin/util/perl";});
         die "Something went wrong with $sourced/$f: $!\n" unless $template;
         my @text =
             split /^/m,