File tree Expand file tree Collapse file tree 1 file changed +6
-7
lines changed Expand file tree Collapse file tree 1 file changed +6
-7
lines changed Original file line number Diff line number Diff line change @@ -6,7 +6,7 @@ use warnings;
6
6
use parent qw( Exporter) ;
7
7
8
8
use File::Spec;
9
- use Cwd qw( abs_path ) ;
9
+ use File::Basename qw( dirname ) ;
10
10
11
11
our @EXPORT = (' %setup' );
12
12
@@ -16,19 +16,18 @@ our %setup = (
16
16
vardir => ' ./var' ,
17
17
);
18
18
19
- # Compute directly libdir from this setup file as it should be installed
20
- # in expected directory
19
+ # Compute directly libdir from this setup file as it should be installed in expected directory
21
20
eval {
22
- $setup {libdir } = abs_path( File::Spec-> rel2abs(' .. ' , __FILE__ ))
23
- unless ( $setup {libdir } && File::Spec-> file_name_is_absolute($setup {libdir }) );
21
+ $setup {libdir } = File::Spec-> rel2abs(dirname( __FILE__ ))
22
+ unless $setup {libdir } && File::Spec-> file_name_is_absolute($setup {libdir });
24
23
25
24
# If run from sources, we can try to rebase setup keys to absolute folders related to libdir
26
25
if (File::Spec-> file_name_is_absolute($setup {libdir })) {
27
26
foreach my $key (qw( datadir vardir) ) {
28
27
# Anyway don't update if target still absolute
29
- next if ( $setup {$key } && File::Spec-> file_name_is_absolute($setup {$key }) );
28
+ next if $setup {$key } && File::Spec-> file_name_is_absolute($setup {$key });
30
29
31
- my $folder = abs_path( File::Spec-> rel2abs(' ../ ' . $setup {$key }, $setup {libdir }));
30
+ my $folder = File::Spec-> rel2abs($setup {$key }, dirname( $setup {libdir }));
32
31
$setup {$key } = $folder if $folder && -d $folder ;
33
32
}
34
33
}
You can’t perform that action at this time.
0 commit comments