[Module-build-checkins] Module-Build/lib/Module/Build Base.pm,1.438,1.439
Status: Beta
Brought to you by:
kwilliams
|
From: Ken W. <kwi...@us...> - 2005-06-23 01:46:28
|
Update of /cvsroot/module-build/Module-Build/lib/Module/Build In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1702/lib/Module/Build Modified Files: Base.pm Log Message: Apply Schwern's patch to get de-tilde-fication working Index: Base.pm =================================================================== RCS file: /cvsroot/module-build/Module-Build/lib/Module/Build/Base.pm,v retrieving revision 1.438 retrieving revision 1.439 diff -u -d -r1.438 -r1.439 --- Base.pm 23 Jun 2005 01:41:31 -0000 1.438 +++ Base.pm 23 Jun 2005 01:46:19 -0000 1.439 @@ -124,12 +124,6 @@ } } - # De-tilde-ify any path parameters - for (qw(prefix install_base install_path install_dest)) { - next unless exists $p->{$_} and defined $p->{$_}; - ($p->{$_}) = glob($p->{$_}) if $p->{$_} =~ /^~/; - } - # The following warning could be unnecessary if the user is running # an embedded perl, but there aren't too many of those around, and # embedded perls aren't usually used to install modules, and the @@ -1263,6 +1257,12 @@ } $args{$_} = \%hash; } + + # De-tilde-ify any path parameters + for my $key (qw(prefix install_base install_path install_dest)) { + next if !defined $args{$key}; + ($args{$key}) = glob($args{$key}) if $args{$key} =~ /^~/; + } if ($args{makefile_env_macros}) { require Module::Build::Compat; |