--- perl-5.6.0/lib/ExtUtils/MM_Unix.pm.pius Thu Mar 2 18:52:52 2000 +++ perl-5.6.0/lib/ExtUtils/MM_Unix.pm Sun Jul 2 11:13:32 2000 @@ -552,8 +552,7 @@ AR_STATIC_ARGS NAME DISTNAME NAME_SYM VERSION VERSION_SYM XS_VERSION INST_BIN INST_EXE INST_LIB INST_ARCHLIB INST_SCRIPT PREFIX INSTALLDIRS - INSTALLPRIVLIB INSTALLARCHLIB INSTALLSITELIB - INSTALLSITEARCH INSTALLBIN INSTALLSCRIPT PERL_LIB + PERL_LIB PERL_ARCHLIB SITELIBEXP SITEARCHEXP LIBPERL_A MYEXTLIB FIRST_MAKEFILE MAKE_APERL_FILE PERLMAINCC PERL_SRC PERL_INC PERL FULLPERL FULL_AR @@ -563,6 +562,16 @@ push @m, "$tmp = $self->{$tmp}\n"; } + for $tmp (qw/ + + INSTALLPRIVLIB INSTALLARCHLIB INSTALLSITELIB + INSTALLSITEARCH INSTALLBIN INSTALLSCRIPT + + / ) { + next unless defined $self->{$tmp}; + push @m, "$tmp = \$\(DESTDIR\)$self->{$tmp}\n"; + } + push @m, qq{ VERSION_MACRO = VERSION DEFINE_VERSION = -D\$(VERSION_MACRO)=\\\"\$(VERSION)\\\" @@ -609,12 +618,19 @@ INST_HTMLSITELIBDIR INSTALLHTMLSITELIBDIR INST_HTMLSCRIPTDIR INSTALLHTMLSCRIPTDIR INST_HTMLLIBDIR HTMLEXT - INST_MAN1DIR INSTALLMAN1DIR MAN1EXT - INST_MAN3DIR INSTALLMAN3DIR MAN3EXT + INST_MAN1DIR MAN1EXT + INST_MAN3DIR MAN3EXT /) { next unless defined $self->{$tmp}; push @m, "$tmp = $self->{$tmp}\n"; } + + for $tmp (qw/ + INSTALLMAN1DIR INSTALLMAN3DIR + /) { + next unless defined $self->{$tmp}; + push @m, "$tmp = \$\(DESTDIR\)$self->{$tmp}\n"; + } for $tmp (qw( PERM_RW PERM_RWX