[pkgsrc/trunk]: pkgsrc Move the PLIST_SUBST lines that substitute for PERL5_*...

[jlam <jlam%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/68ed53e1a34c
branches:  trunk
changeset: 494174:68ed53e1a34c
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Fri May 20 03:00:16 2005 +0000

description:
Move the PLIST_SUBST lines that substitute for PERL5_* variables from
perl5/module.mk into tools/perl.mk so that the substitution occurs for
all packages that use perl.

diffstat:

 lang/perl5/module.mk |  6 +-----
 mk/tools/perl.mk     |  7 ++++++-
 2 files changed, 7 insertions(+), 6 deletions(-)

diffs (39 lines):

diff -r f426c1e0d733 -r 68ed53e1a34c lang/perl5/module.mk
--- a/lang/perl5/module.mk      Fri May 20 02:57:23 2005 +0000
+++ b/lang/perl5/module.mk      Fri May 20 03:00:16 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.45 2005/05/18 22:42:07 jlam Exp $
+# $NetBSD: module.mk,v 1.46 2005/05/20 03:00:16 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install perl5 modules.
@@ -145,10 +145,6 @@
 PERL5_MAKE_FLAGS+=     OTHERLDFLAGS="${LDFLAGS}"
 .endif
 
-PLIST_SUBST+=  PERL5_SITELIB=${PERL5_SUB_INSTALLSITELIB}
-PLIST_SUBST+=  PERL5_SITEARCH=${PERL5_SUB_INSTALLSITEARCH}
-PLIST_SUBST+=  PERL5_ARCHLIB=${PERL5_SUB_INSTALLARCHLIB}
-
 # Generate the PLIST from the files listed in PERL5_PACKLIST.
 .if defined(PERL5_PACKLIST)
 PERL5_PLIST_COMMENT= \
diff -r f426c1e0d733 -r 68ed53e1a34c mk/tools/perl.mk
--- a/mk/tools/perl.mk  Fri May 20 02:57:23 2005 +0000
+++ b/mk/tools/perl.mk  Fri May 20 03:00:16 2005 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: perl.mk,v 1.13 2005/05/19 03:52:23 jlam Exp $
+# $NetBSD: perl.mk,v 1.14 2005/05/20 03:00:16 jlam Exp $
 #
 # This Makefile fragment defines additional variables that are used by
 # packages that use the perl tool.
@@ -19,4 +19,9 @@
 # includes find-prefix.mk.
 #
 .  include "../../lang/perl5/vars.mk"
+
+# Substitute for PERL5_* variables in PLISTs.
+PLIST_SUBST+=  PERL5_SITELIB=${PERL5_SUB_INSTALLSITELIB}
+PLIST_SUBST+=  PERL5_SITEARCH=${PERL5_SUB_INSTALLSITEARCH}
+PLIST_SUBST+=  PERL5_ARCHLIB=${PERL5_SUB_INSTALLARCHLIB}
 .endif