diff options
| author | abs <abs> | 2011-05-16 07:59:04 +0000 |
|---|---|---|
| committer | abs <abs> | 2011-05-16 07:59:04 +0000 |
| commit | 88a51e7481c7e4521dbbeae435a1f6ee5fd829dc (patch) | |
| tree | cd813aea38e91a0dad163e30b9953596d011e6af /lang | |
| parent | b59844581e078584b56554de0246d4171d343b9c (diff) | |
| download | pkgsrc-88a51e7481c7e4521dbbeae435a1f6ee5fd829dc.tar.gz | |
Allow sitebin to be overridden by PERL5_SITEBIN. No change to default build
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/perl5/Makefile | 3 | ||||
| -rw-r--r-- | lang/perl5/dirs.mk | 4 | ||||
| -rw-r--r-- | lang/perl5/files/Policy.sh | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index 9172053eed9..25170e80eb1 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.171 2011/04/07 04:03:57 taca Exp $ +# $NetBSD: Makefile,v 1.172 2011/05/16 07:59:04 abs Exp $ .include "license.mk" .include "Makefile.common" @@ -70,6 +70,7 @@ PERL5_SCRIPTDIR= ${PERL5_PERLBASE}/bin SUBST_VARS.policysh+= PERL5_SCRIPTDIR SUBST_VARS.policysh+= PERL5_PERLBASE SUBST_VARS.policysh+= PERL5_SITEBASE +SUBST_VARS.policysh+= PERL5_SITEBIN SUBST_VARS.policysh+= PERL5_VENDORBASE SUBST_VARS.policysh+= PERL5_PRIVLIB SUBST_VARS.policysh+= PERL5_SITELIB diff --git a/lang/perl5/dirs.mk b/lang/perl5/dirs.mk index 9f480855cc8..f641d2cad42 100644 --- a/lang/perl5/dirs.mk +++ b/lang/perl5/dirs.mk @@ -1,4 +1,4 @@ -# $NetBSD: dirs.mk,v 1.1 2010/08/27 05:27:37 sno Exp $ +# $NetBSD: dirs.mk,v 1.2 2011/05/16 07:59:04 abs Exp $ # # Provide typical required Perl directories @@ -28,6 +28,8 @@ PERL5_SITEBASE= ${PERL5_SITEPREFIX}/lib/perl5/site_perl PERL5_SITEBASE= ${PERL5_SITEPREFIX} .endif +PERL5_SITEBIN?= ${PERL5_SITEBASE}/bin + PERL5_PRIVLIB= ${PERL5_PERLBASE}/${PERL5_API_VERS} PERL5_VENDORLIB= ${PERL5_VENDORBASE}/${PERL5_API_VERS} .if !empty(PERL5_SITEBASE:M*lib/perl5/site_perl) diff --git a/lang/perl5/files/Policy.sh b/lang/perl5/files/Policy.sh index 28759350bf4..2365373fdc3 100644 --- a/lang/perl5/files/Policy.sh +++ b/lang/perl5/files/Policy.sh @@ -1,4 +1,4 @@ -# $NetBSD: Policy.sh,v 1.1 2010/08/19 20:47:10 seb Exp $ +# $NetBSD: Policy.sh,v 1.2 2011/05/16 07:59:04 abs Exp $ # # Site-wide policy settings for pkgsrc Perl # @@ -35,7 +35,7 @@ vendorscript='@PERL5_VENDORBASE@/bin' # Put any compiled binaries into vendor- and site-specific locations to # avoid conflicts with each other. The perllink script will handle all # the appropriate symlinking. -sitebin='@PERL5_SITEBASE@/bin' +sitebin='@PERL5_SITEBIN@' vendorbin='@PERL5_VENDORBASE@/bin' # Put the API-specific files into API-specific directories instead |