changeset 383:e37246d1c149

6780150 ImageMagick should not deliver perl modules in site_perl.
author Danek Duvall <danek.duvall@oracle.com>
date Fri, 08 Jul 2011 10:36:32 -0700
parents 5d2ca734dd20
children cef5d5e02ade
files components/imagemagick/Makefile components/imagemagick/imagemagick.p5m
diffstat 2 files changed, 12 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/components/imagemagick/Makefile	Fri Jul 08 13:30:02 2011 -0700
+++ b/components/imagemagick/Makefile	Fri Jul 08 10:36:32 2011 -0700
@@ -68,6 +68,7 @@
 CONFIGURE_OPTIONS+= --enable-static=no
 CONFIGURE_OPTIONS+= --without-gvc
 CONFIGURE_OPTIONS.32+= --with-perl=$(PERL)
+CONFIGURE_OPTIONS.32+= --with-perl-options="INSTALLDIRS=vendor"
 CONFIGURE_OPTIONS.64+= --without-perl
 
 # common targets
--- a/components/imagemagick/imagemagick.p5m	Fri Jul 08 13:30:02 2011 -0700
+++ b/components/imagemagick/imagemagick.p5m	Fri Jul 08 10:36:32 2011 -0700
@@ -60,13 +60,13 @@
 dir path=usr/perl5/$(PERL_VERSION)
 dir path=usr/perl5/$(PERL_VERSION)/man
 dir path=usr/perl5/$(PERL_VERSION)/man/man3
-dir path=usr/perl5/site_perl
-dir path=usr/perl5/site_perl/$(PERL_VERSION)
-dir path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)
-dir path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/Image
-dir path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto
-dir path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image
-dir path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick
+dir path=usr/perl5/vendor_perl
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Image
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image
+dir path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick
 dir path=usr/share
 dir path=usr/share/ImageMagick-$(COMPONENT_VERSION)
 dir path=usr/share/ImageMagick-$(COMPONENT_VERSION)/config
@@ -540,13 +540,13 @@
 file path=usr/lib/pkgconfig/ImageMagick.pc
 file path=usr/lib/pkgconfig/Wand.pc
 file path=usr/perl5/$(PERL_VERSION)/man/man3/Image::Magick.3
-file path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/Image/Magick.pm
+file path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/Image/Magick.pm
 file \
-    path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Magick.bs
+    path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Magick.bs
 file \
-    path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Magick.so
+    path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/Magick.so
 file \
-    path=usr/perl5/site_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/autosplit.ix
+    path=usr/perl5/vendor_perl/$(PERL_VERSION)/$(PERL_ARCH)/auto/Image/Magick/autosplit.ix
 file path=usr/share/ImageMagick-$(COMPONENT_VERSION)/ChangeLog
 file path=usr/share/ImageMagick-$(COMPONENT_VERSION)/LICENSE
 file path=usr/share/ImageMagick-$(COMPONENT_VERSION)/NEWS