summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorwiz <wiz>2001-02-20 16:42:10 +0000
committerwiz <wiz>2001-02-20 16:42:10 +0000
commit04a7b8206a45661e7ceb9dc1296b13d6fe83b403 (patch)
tree908ebda714524c22b86297b26ba6544f8a5b65a5 /mk
parent74a160696ecbb96e605c0fedb9a57d09a65216fd (diff)
downloadpkgsrc-04a7b8206a45661e7ceb9dc1296b13d6fe83b403.tar.gz
Use ${LOCALBASE}/share/mk/bsd.perl.mk (as installed by perl-mk), if it
exists, to set some variables, instead of starting perl for getting the values (fallback code to old case still there). BUILD_DEPEND on perl-mk in USE_PERL5 case for speed-up reasons.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk9
1 files changed, 6 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index c34b2a7a7c5..b3d709f8a99 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.667 2001/02/19 18:30:36 hubertf Exp $
+# $NetBSD: bsd.pkg.mk,v 1.668 2001/02/20 16:42:10 wiz Exp $
#
# This file is in the public domain.
#
@@ -157,7 +157,10 @@ PERL5?= ${LOCALBASE}/bin/perl
.if defined(USE_PERL5)
DEPENDS+= perl-5.*:../../lang/perl5
.if exists(${PERL5})
-.if !defined(PERL5_SITELIB) || !defined(PERL5_SITEARCH) || !defined(PERL5_ARCHLIB)
+BUILD_DEPENDS+= perl-mk-1.0:../../pkgtools/perl-mk
+.if exists(${LOCALBASE}/share/mk/bsd.perl.mk)
+.include "${LOCALBASE}/share/mk/bsd.perl.mk"
+.elif !defined(PERL5_SITELIB) || !defined(PERL5_SITEARCH) || !defined(PERL5_ARCHLIB)
PERL5_SITELIB!= eval `${PERL5} -V:installsitelib 2>/dev/null`; \
echo $${installsitelib}
PERL5_SITEARCH!= eval `${PERL5} -V:installsitearch 2>/dev/null`; \
@@ -167,7 +170,7 @@ PERL5_ARCHLIB!= eval `${PERL5} -V:installarchlib 2>/dev/null`; \
MAKEFLAGS+= PERL5_SITELIB=${PERL5_SITELIB}
MAKEFLAGS+= PERL5_SITEARCH=${PERL5_SITEARCH}
MAKEFLAGS+= PERL5_ARCHLIB=${PERL5_ARCHLIB}
-.endif # !defined(PERL5_*)
+.endif # !exists(bsd.perl.mk) && !defined(PERL5_*)
.endif # exists($PERL5)
.endif # USE_PERL5