diff options
| author | fukachan <fukachan> | 2010-11-28 06:59:35 +0000 |
|---|---|---|
| committer | fukachan <fukachan> | 2010-11-28 06:59:35 +0000 |
| commit | 5ff5a23652d7e4745005be4490281e970df903c2 (patch) | |
| tree | 6a41fcad62be3589b86a1e0569455be944670141 /fml/lib | |
| parent | 8faa1999f432bd60ff2682111053f99c0b385b16 (diff) | |
| download | fml8-5ff5a23652d7e4745005be4490281e970df903c2.tar.gz fml8-5ff5a23652d7e4745005be4490281e970df903c2.tar.bz2 fml8-5ff5a23652d7e4745005be4490281e970df903c2.zip | |
fix vendor expansion bug (bug fix previous commit).
*important changes*
do not overwrite file in installation. changes for the further
enhancement, e.g. in other softowares.
Actually, the current fml installation does not chanes since the
file/directory names do not conflict.
Diffstat (limited to 'fml/lib')
| -rw-r--r-- | fml/lib/FML/Install.pm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fml/lib/FML/Install.pm b/fml/lib/FML/Install.pm index ad53dccb..277889e7 100644 --- a/fml/lib/FML/Install.pm +++ b/fml/lib/FML/Install.pm @@ -4,7 +4,7 @@ # All rights reserved. This program is free software; you can # redistribute it and/or modify it under the same terms as Perl itself. # -# $FML: Install.pm,v 1.21 2008/06/28 21:16:12 fukachan Exp $ +# $FML: Install.pm,v 1.22 2010/11/09 08:22:10 fukachan Exp $ # package FML::Install; @@ -178,7 +178,7 @@ sub convert for my $vendor (@$vendors) { my $src = sprintf("%s", $src); $src =~ s/__VENDOR__/$vendor/g; - if (-f $src) { + if (-f $src && ! -f $dst) { print STDERR " copying from $src\n" if $debug; $self->_convert($src, $dst, $mode); } @@ -514,7 +514,7 @@ sub install_bin_programs for my $prog (@$progs) { # XXX src = relative path, dst = absolute path - my $src = File::Spec->catfile("fml", "bin", $prog); + my $src = File::Spec->catfile("__VENDOR__", "bin", $prog); my $dst = File::Spec->catfile($install_root, $dst_dir, $prog); print STDERR "updating $dst\n" if $debug; @@ -1107,7 +1107,7 @@ sub message_nl use File::Spec; $class =~ s@\.@/@g; # XXX . -> / - my $msg_dir = File::Spec->catfile("fml", "share", "message"); + my $msg_dir = File::Spec->catfile("__VENDOR__", "share", "message"); my $msg_file = File::Spec->catfile($msg_dir, $charset, $class); if (-f $msg_file) { |