diff options
| author | Nick Ing-Simmons <nik@tiuk.ti.com> | 2002-04-08 07:28:27 +0000 |
|---|---|---|
| committer | Nick Ing-Simmons <nik@tiuk.ti.com> | 2002-04-08 07:28:27 +0000 |
| commit | 80a5d8e74b5512d4ab704d0e83466ae41247ce55 (patch) | |
| tree | c4e199a38350b2fca65e872de2593997e454138b /lib/ExtUtils/MM_Win32.pm | |
| parent | 004283b80f6094bb85aba6f48a74e3c5c34ea24f (diff) | |
| download | perl-80a5d8e74b5512d4ab704d0e83466ae41247ce55.tar.gz | |
Integrate mainline
p4raw-id: //depot/perlio@15801
Diffstat (limited to 'lib/ExtUtils/MM_Win32.pm')
| -rw-r--r-- | lib/ExtUtils/MM_Win32.pm | 28 |
1 files changed, 4 insertions, 24 deletions
diff --git a/lib/ExtUtils/MM_Win32.pm b/lib/ExtUtils/MM_Win32.pm index d8c73675a1..923f057ee7 100644 --- a/lib/ExtUtils/MM_Win32.pm +++ b/lib/ExtUtils/MM_Win32.pm @@ -184,14 +184,15 @@ sub constants { for $tmp (qw/ AR_STATIC_ARGS NAME DISTNAME NAME_SYM VERSION - VERSION_SYM XS_VERSION INST_BIN INST_EXE INST_LIB + VERSION_SYM XS_VERSION INST_BIN INST_LIB INST_ARCHLIB INST_SCRIPT PREFIX INSTALLDIRS INSTALLPRIVLIB INSTALLARCHLIB INSTALLSITELIB INSTALLSITEARCH INSTALLBIN INSTALLSCRIPT PERL_LIB PERL_ARCHLIB SITELIBEXP SITEARCHEXP LIBPERL_A MYEXTLIB FIRST_MAKEFILE MAKE_APERL_FILE PERLMAINCC PERL_SRC PERL_INC PERL FULLPERL PERLRUN FULLPERLRUN PERLRUNINST - FULLPERLRUNINST TEST_LIBS FULL_AR PERL_CORE + FULLPERLRUNINST ABSPERL ABSPERLRUN ABSPERLRUNINST + FULL_AR PERL_CORE / ) { next unless defined $self->{$tmp}; @@ -475,26 +476,6 @@ sub export_list return "$self->{BASEEXT}.def"; } -=item canonpath - -No physical check on the filesystem, but a logical cleanup of a -path. On UNIX eliminated successive slashes and successive "/.". - -=cut - -sub canonpath { - my($self,$path) = @_; - $path =~ s/^([a-z]:)/\u$1/; - $path =~ s|/|\\|g; - $path =~ s|(.)\\+|$1\\|g ; # xx////xx -> xx/xx - $path =~ s|(\\\.)+\\|\\|g ; # xx/././xx -> xx/xx - $path =~ s|^(\.\\)+|| unless $path eq ".\\"; # ./xx -> xx - $path =~ s|\\$|| - unless $path =~ m#^([a-z]:)?\\#; # xx/ -> xx - $path .= '.' if $path =~ m#\\$#; - $path; -} - =item perl_script Takes one argument, a file name, and returns the file name, if the @@ -529,7 +510,7 @@ pm_to_blib: $(TO_INST_PM) : $DMAKE ? 'qw[ $(mktmp,pmfiles.dat $(PM_TO_BLIB:s,\\,\\\\,)\n) ],' : '{ qw[$(PM_TO_BLIB)] },' ).q{'}.$autodir.q{','$(PM_FILTER)')" - }. ($NMAKE ? q{ +}. ($NMAKE ? q{ $(PM_TO_BLIB) << } : '') . $self->{NOECHO}.q{$(TOUCH) $@ @@ -786,7 +767,6 @@ sub pasthru { } - 1; __END__ |