diff options
| author | jlam <jlam> | 2002-04-09 22:15:40 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2002-04-09 22:15:40 +0000 |
| commit | 24140cc5992b514c5a3d68205d901efbd1813da6 (patch) | |
| tree | 090bb966329576beafdc893ccb9c33faae729965 /mk | |
| parent | 8d257c61a211b2e60374f0d22c14050d24cfd25f (diff) | |
| download | pkgsrc-24140cc5992b514c5a3d68205d901efbd1813da6.tar.gz | |
Move definition of PERL5 from bsd.pkg.mk into defs.*.mk. This is something
that is used regardless of whether perl is installed or not, and we
sometimes want its value before include bsd.pkg.mk.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 3 | ||||
| -rw-r--r-- | mk/defs.Darwin.mk | 3 | ||||
| -rw-r--r-- | mk/defs.Linux.mk | 3 | ||||
| -rw-r--r-- | mk/defs.NetBSD.mk | 3 | ||||
| -rw-r--r-- | mk/defs.SunOS.mk | 3 |
5 files changed, 9 insertions, 6 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index afbf0975a99..77e606373ea 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.959 2002/04/07 17:09:57 dmcmahill Exp $ +# $NetBSD: bsd.pkg.mk,v 1.960 2002/04/09 22:15:40 jlam Exp $ # # This file is in the public domain. # @@ -167,7 +167,6 @@ RESTRICTED?= uses Kerberos encryption code BUILD_DEFS+= KERBEROS .endif -PERL5?= ${LOCALBASE}/bin/perl PERL5_REQD?= 5.0 .if defined(USE_PERL5) DEPENDS+= perl>=${PERL5_REQD}:../../lang/perl5 diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk index fd3c6bb1eac..89980d40d61 100644 --- a/mk/defs.Darwin.mk +++ b/mk/defs.Darwin.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Darwin.mk,v 1.20 2002/03/14 02:28:23 lukem Exp $ +# $NetBSD: defs.Darwin.mk,v 1.21 2002/04/09 22:15:41 jlam Exp $ # # Variable definitions for the Darwin operating system. @@ -35,6 +35,7 @@ MTREE?= /usr/sbin/mtree MV?= /bin/mv PATCH?= /usr/bin/patch PAX?= /bin/pax +PERL5?= ${LOCALBASE}/bin/perl PKGLOCALEDIR?= share PS?= /bin/ps RM?= /bin/rm diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk index c64ef60f666..db9669a2d6e 100644 --- a/mk/defs.Linux.mk +++ b/mk/defs.Linux.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.Linux.mk,v 1.24 2002/03/14 02:28:23 lukem Exp $ +# $NetBSD: defs.Linux.mk,v 1.25 2002/04/09 22:15:41 jlam Exp $ # # Variable definitions for the Linux operating system. @@ -35,6 +35,7 @@ MTREE?= ${ZOULARISBASE}/bin/mtree MV?= /bin/mv PATCH?= /usr/bin/patch PAX?= ${ZOULARISBASE}/bin/pax +PERL5?= ${LOCALBASE}/bin/perl PKGLOCALEDIR?= share PS?= /bin/ps RM?= /bin/rm diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk index 06c39a21d5c..21a48e60d57 100644 --- a/mk/defs.NetBSD.mk +++ b/mk/defs.NetBSD.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.NetBSD.mk,v 1.23 2002/03/14 02:28:23 lukem Exp $ +# $NetBSD: defs.NetBSD.mk,v 1.24 2002/04/09 22:15:41 jlam Exp $ # # Variable definitions for the NetBSD operating system. @@ -35,6 +35,7 @@ MTREE?= /usr/sbin/mtree MV?= /bin/mv PATCH?= /usr/bin/patch PAX?= /bin/pax +PERL5?= ${LOCALBASE}/bin/perl PKGLOCALEDIR?= share PS?= /bin/ps RM?= /bin/rm diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk index 69330ac34a8..0afd6085caf 100644 --- a/mk/defs.SunOS.mk +++ b/mk/defs.SunOS.mk @@ -1,4 +1,4 @@ -# $NetBSD: defs.SunOS.mk,v 1.22 2002/03/14 02:28:23 lukem Exp $ +# $NetBSD: defs.SunOS.mk,v 1.23 2002/04/09 22:15:41 jlam Exp $ # # Variable definitions for the SunOS/Solaris operating system. @@ -46,6 +46,7 @@ PATCH?= /usr/bin/gpatch -b PATCH?= ${LOCALBASE}/bin/patch -b .endif PAX?= /bin/pax +PERL5?= ${LOCALBASE}/bin/perl PKGLOCALEDIR?= lib PS?= /bin/ps RM?= /usr/bin/rm |