[Module-build-checkins] Module-Build/lib/Module/Build Compat.pm,1.69,1.70
Status: Beta
Brought to you by:
kwilliams
From: Ken W. <kwi...@us...> - 2005-11-14 03:05:21
|
Update of /cvsroot/module-build/Module-Build/lib/Module/Build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv6163/lib/Module/Build Modified Files: Compat.pm Log Message: Yet again, fix the abs->rel translation of 'use lib' for a custom subclass Index: Compat.pm =================================================================== RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Compat.pm,v retrieving revision 1.69 retrieving revision 1.70 diff -u -d -r1.69 -r1.70 --- Compat.pm 24 Oct 2005 12:34:30 -0000 1.69 +++ Compat.pm 14 Nov 2005 03:05:13 -0000 1.70 @@ -49,9 +49,13 @@ if (File::Spec->file_name_is_absolute($subclass_dir)) { my $base_dir = $build->base_dir; - $build->log_warn("Warning: builder subclass " . ref($build) . - " doesn't seem to have been loaded from within $base_dir") - unless $build->dir_contains($base_dir, $subclass_dir); + + if ($build->dir_contains($base_dir, $subclass_dir)) { + $subclass_dir = File::Spec->abs2rel($subclass_dir, $base_dir); + } else { + $build->log_warn("Warning: builder subclass " . ref($build) . + " doesn't seem to have been loaded from within $base_dir"); + } } $subclass_load = "use lib '$subclass_dir';"; } |