Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | Upstream-Status:Inappropriate [debian patch] |
| 2 | |
| 3 | Part of 52_debian_extutils_hacks.patch just to exclude the installation of .packlist files |
| 4 | |
| 5 | Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> |
| 6 | --- |
| 7 | cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm | 35 ++--------------------- |
| 8 | 1 file changed, 3 insertions(+), 32 deletions(-) |
| 9 | |
| 10 | diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm |
| 11 | index f63145c..a589710 100644 |
| 12 | --- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm |
| 13 | +++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm |
| 14 | @@ -2122,11 +2122,6 @@ pure_perl_install :: all |
| 15 | }; |
| 16 | |
| 17 | push @m, |
| 18 | -q{ read "}.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{" \ |
| 19 | - write "}.$self->catfile('$(DESTINSTALLARCHLIB)','auto','$(FULLEXT)','.packlist').q{" \ |
| 20 | -} unless $self->{NO_PACKLIST}; |
| 21 | - |
| 22 | - push @m, |
| 23 | q{ "$(INST_LIB)" "$(DESTINSTALLPRIVLIB)" \ |
| 24 | "$(INST_ARCHLIB)" "$(DESTINSTALLARCHLIB)" \ |
| 25 | "$(INST_BIN)" "$(DESTINSTALLBIN)" \ |
| 26 | @@ -2158,10 +2153,6 @@ q{ "$(INST_LIB)" "$(DESTINSTALLSITELIB)" \ |
| 27 | pure_vendor_install :: all |
| 28 | $(NOECHO) $(MOD_INSTALL) \ |
| 29 | }; |
| 30 | - push @m, |
| 31 | -q{ read "}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{" \ |
| 32 | - write "}.$self->catfile('$(DESTINSTALLVENDORARCH)','auto','$(FULLEXT)','.packlist').q{" \ |
| 33 | -} unless $self->{NO_PACKLIST}; |
| 34 | |
| 35 | push @m, |
| 36 | q{ "$(INST_LIB)" "$(DESTINSTALLVENDORLIB)" \ |
| 37 | @@ -2187,37 +2178,19 @@ doc_vendor_install :: all |
| 38 | |
| 39 | push @m, q{ |
| 40 | doc_perl_install :: all |
| 41 | - $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod" |
| 42 | - -$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)" |
| 43 | - -$(NOECHO) $(DOC_INSTALL) \ |
| 44 | - "Module" "$(NAME)" \ |
| 45 | - "installed into" $(INSTALLPRIVLIB) \ |
| 46 | - LINKTYPE "$(LINKTYPE)" \ |
| 47 | - VERSION "$(VERSION)" \ |
| 48 | - EXE_FILES "$(EXE_FILES)" \ |
| 49 | - >> "}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{" |
| 50 | |
| 51 | doc_site_install :: all |
| 52 | - $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod" |
| 53 | - -$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)" |
| 54 | + $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLSITEARCH)/perllocal.pod" |
| 55 | + -$(NOECHO) $(MKPATH) "$(DESTINSTALLSITEARCH)" |
| 56 | -$(NOECHO) $(DOC_INSTALL) \ |
| 57 | "Module" "$(NAME)" \ |
| 58 | "installed into" $(INSTALLSITELIB) \ |
| 59 | LINKTYPE "$(LINKTYPE)" \ |
| 60 | VERSION "$(VERSION)" \ |
| 61 | EXE_FILES "$(EXE_FILES)" \ |
| 62 | - >> "}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{" |
| 63 | + >> "}.$self->catfile('$(DESTINSTALLSITEARCH)','perllocal.pod').q{" |
| 64 | |
| 65 | doc_vendor_install :: all |
| 66 | - $(NOECHO) $(ECHO) Appending installation info to "$(DESTINSTALLARCHLIB)/perllocal.pod" |
| 67 | - -$(NOECHO) $(MKPATH) "$(DESTINSTALLARCHLIB)" |
| 68 | - -$(NOECHO) $(DOC_INSTALL) \ |
| 69 | - "Module" "$(NAME)" \ |
| 70 | - "installed into" $(INSTALLVENDORLIB) \ |
| 71 | - LINKTYPE "$(LINKTYPE)" \ |
| 72 | - VERSION "$(VERSION)" \ |
| 73 | - EXE_FILES "$(EXE_FILES)" \ |
| 74 | - >> "}.$self->catfile('$(DESTINSTALLARCHLIB)','perllocal.pod').q{" |
| 75 | |
| 76 | } unless $self->{NO_PERLLOCAL}; |
| 77 | |
| 78 | @@ -2226,13 +2199,11 @@ uninstall :: uninstall_from_$(INSTALLDIRS)dirs |
| 79 | $(NOECHO) $(NOOP) |
| 80 | |
| 81 | uninstall_from_perldirs :: |
| 82 | - $(NOECHO) $(UNINSTALL) "}.$self->catfile('$(PERL_ARCHLIB)','auto','$(FULLEXT)','.packlist').q{" |
| 83 | |
| 84 | uninstall_from_sitedirs :: |
| 85 | $(NOECHO) $(UNINSTALL) "}.$self->catfile('$(SITEARCHEXP)','auto','$(FULLEXT)','.packlist').q{" |
| 86 | |
| 87 | uninstall_from_vendordirs :: |
| 88 | - $(NOECHO) $(UNINSTALL) "}.$self->catfile('$(VENDORARCHEXP)','auto','$(FULLEXT)','.packlist').q{" |
| 89 | }; |
| 90 | |
| 91 | join("",@m); |