From 85152ca4a1e9827d48dc9cbe266da3f90f3d158a Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Tue, 2 Feb 2016 19:47:05 +0100 Subject: [PATCH] Use a simpler method to build a glob than splitpath and catpath It turns out that the combination splitpath() could return an empty string for the directory part. This doesn't play well with catdir(). Reviewed-by: Rich Salz --- Configure | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Configure b/Configure index 06eca504b5..44cb40b7c1 100755 --- a/Configure +++ b/Configure @@ -10,7 +10,7 @@ require 5.000; use strict; use File::Basename; -use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs catpath splitpath/; +use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs/; use File::Path qw/make_path/; use Cwd qw/:DEFAULT realpath/; @@ -175,8 +175,7 @@ die "erroneous version information in opensslv.h: ", # Collect target configurations -my ($vol, $dir, $dummy) = splitpath($0); -my $pattern = catpath($vol, catdir($dir, "Configurations"), "*.conf"); +my $pattern = catfile(dirname($0), "Configurations", "*.conf"); foreach (sort glob($pattern) ) { &read_config($_); } -- 2.34.1