]>
Commit | Line | Data |
---|---|---|
433d8b09 | 1 | --- lib/ExtUtils/MM_Unix.pm.orig Tue Feb 25 16:03:41 2003 |
2 | +++ lib/ExtUtils/MM_Unix.pm Tue Feb 25 16:19:23 2003 | |
3 | @@ -499,7 +499,7 @@ | |
4 | # pathnames can have sharp signs in them; escape them so | |
5 | # make doesn't think it is a comment-start character. | |
6 | $self->{$tmp} =~ s/#/\\#/g; | |
7 | - push @m, "$tmp = $self->{$tmp}\n"; | |
8 | + push @m, "$tmp = " . ($tmp =~ /^INSTALL(?!DIRS\b)/ ? '$(DESTDIR)' : '') . "$self->{$tmp}\n"; | |
9 | } | |
10 | ||
11 | push @m, qq{ | |
12 | @@ -549,7 +549,7 @@ | |
13 | /) | |
14 | { | |
15 | next unless defined $self->{$tmp}; | |
16 | - push @m, "$tmp = $self->{$tmp}\n"; | |
17 | + push @m, "$tmp = " . ($tmp =~ /^INSTALL/ ? '$(DESTDIR)' : '') . "$self->{$tmp}\n"; | |
18 | } | |
19 | ||
20 | for $tmp (qw( | |
21 | @@ -1884,9 +1884,9 @@ | |
22 | ||
23 | if( $Config{usevendorprefix} ) { | |
24 | $Config_Override{installvendorman1dir} = | |
25 | - File::Spec->catdir($Config{vendorprefixexp}, 'man', 'man$(MAN1EXT)'); | |
26 | + File::Spec->catdir($Config{vendorprefixexp}, 'share', 'man', 'man1'); | |
27 | $Config_Override{installvendorman3dir} = | |
28 | - File::Spec->catdir($Config{vendorprefixexp}, 'man', 'man$(MAN3EXT)'); | |
3ef95ec1 | 29 | + File::Spec->catdir($Config{vendorprefixexp}, 'share', 'man', 'man3'); |
433d8b09 | 30 | } |
31 | else { | |
32 | $Config_Override{installvendorman1dir} = ''; | |
33 | @@ -1905,12 +1905,12 @@ | |
34 | # it up. | |
35 | unless( $Config{installsiteman1dir} ) { | |
36 | $Config_Override{installsiteman1dir} = | |
37 | - File::Spec->catdir($sprefix, 'man', 'man$(MAN1EXT)'); | |
38 | + File::Spec->catdir($sprefix, 'share', 'man', 'man1'); | |
39 | } | |
40 | ||
41 | unless( $Config{installsiteman3dir} ) { | |
42 | $Config_Override{installsiteman3dir} = | |
43 | - File::Spec->catdir($sprefix, 'man', 'man$(MAN3EXT)'); | |
3ef95ec1 | 44 | + File::Spec->catdir($sprefix, 'share', 'man', 'man3'); |
433d8b09 | 45 | } |
46 | ||
47 | unless( $Config{installsitebin} ) { |