diff options
| author | sbd <sbd@pkgsrc.org> | 2012-11-02 07:36:24 +0000 |
|---|---|---|
| committer | sbd <sbd@pkgsrc.org> | 2012-11-02 07:36:24 +0000 |
| commit | 285041316d0904139aaa9c61a5f84364bb7446ba (patch) | |
| tree | aabae34d693d413214425f6a0755361162fb8df1 /lang | |
| parent | 26d17359b337b2d2f6bb958010169ac0daf7336b (diff) | |
| download | pkgsrc-285041316d0904139aaa9c61a5f84364bb7446ba.tar.gz | |
Remove the uneeded PERL5_SCRIPTDIR and PERL5_MAN1DIR variables.
Diffstat (limited to 'lang')
| -rw-r--r-- | lang/perl5/Makefile | 10 | ||||
| -rw-r--r-- | lang/perl5/files/Policy.sh | 6 |
2 files changed, 6 insertions, 10 deletions
diff --git a/lang/perl5/Makefile b/lang/perl5/Makefile index ee4c7a2524e..d152a7a260f 100644 --- a/lang/perl5/Makefile +++ b/lang/perl5/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.184 2012/11/02 07:29:30 sbd Exp $ +# $NetBSD: Makefile,v 1.185 2012/11/02 07:36:24 sbd Exp $ .include "license.mk" .include "Makefile.common" @@ -63,8 +63,6 @@ SUBST_VARS.policysh+= CFLAGS SUBST_VARS.policysh+= PERL5_PREFIX SUBST_VARS.policysh+= PERL5_SITEPREFIX SUBST_VARS.policysh+= PERL5_VENDORPREFIX -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 @@ -72,8 +70,6 @@ SUBST_VARS.policysh+= PERL5_VENDORBASE SUBST_VARS.policysh+= PERL5_PRIVLIB SUBST_VARS.policysh+= PERL5_SITELIB SUBST_VARS.policysh+= PERL5_VENDORLIB -PERL5_MAN1DIR= ${PERL5_PERLBASE}/${PKGMANDIR}/man1 -SUBST_VARS.policysh+= PERL5_MAN1DIR SUBST_VARS.policysh+= PKGMANDIR SUBST_VARS.policysh+= LOCALBASE SUBST_VARS.policysh+= PTHREAD_LDFLAGS @@ -340,8 +336,8 @@ perl5-post-install: ${RUN}if ${TEST} -x ${DESTDIR}${PREFIX}/bin/a2p; then \ strip ${DESTDIR}${PREFIX}/bin/a2p; \ fi - ${RUN}${INSTALL_SCRIPT} ${WRKDIR}/perllink.sh ${DESTDIR}${PERL5_SCRIPTDIR}/perllink; \ - ${INSTALL_MAN} ${FILESDIR}/perllink.1 ${DESTDIR}${PERL5_MAN1DIR}/perllink.1; \ + ${RUN}${INSTALL_SCRIPT} ${WRKDIR}/perllink.sh ${DESTDIR}${PERL5_PERLBASE}/bin/perllink; \ + ${INSTALL_MAN} ${FILESDIR}/perllink.1 ${DESTDIR}${PERL5_PERLBASE}/${PKGMANDIR}/man1/perllink.1; \ ${RM} -f ${DESTDIR}${PREFIX}/bin/perllink \ ${DESTDIR}${PREFIX}/${PKGMANDIR}/man1/perllink.1; \ ${LN} -s ${PERL5_SCRIPTDIR}/perllink ${DESTDIR}${PREFIX}/bin/perllink; \ diff --git a/lang/perl5/files/Policy.sh b/lang/perl5/files/Policy.sh index 2365373fdc3..0ddcbd9da02 100644 --- a/lang/perl5/files/Policy.sh +++ b/lang/perl5/files/Policy.sh @@ -1,4 +1,4 @@ -# $NetBSD: Policy.sh,v 1.2 2011/05/16 07:59:04 abs Exp $ +# $NetBSD: Policy.sh,v 1.3 2012/11/02 07:36:24 sbd Exp $ # # Site-wide policy settings for pkgsrc Perl # @@ -28,7 +28,7 @@ vendorprefix='@PERL5_VENDORPREFIX@' # The Perl Configure script will install scripts into "*/script" # directories if they exist, so override with explicit settings. -scriptdir='@PERL5_SCRIPTDIR@' +scriptdir='@PERL5_PERLBASE@/bin' sitescript='@PERL5_SITEBASE@/bin' vendorscript='@PERL5_VENDORBASE@/bin' @@ -51,7 +51,7 @@ vendorlib_stem='@PERL5_VENDORBASE@' # Avoid manpage conflicts between the standard Perl library, 3rd-party # modules, and other packages. man1ext='1' -man1dir='@PERL5_MAN1DIR@' +man1dir='@PERL5_PERLBASE@/@PKGMANDIR@/man1' siteman1dir='@PERL5_SITEBASE@/@PKGMANDIR@/man1' vendorman1dir='@PERL5_VENDORBASE@/@PKGMANDIR@/man1' man3ext='3' |