[pkgsrc/trunk]: pkgsrc/lang/perl5 _PERL_{INSTALLSITELIB,etc.} shouldn't be ad...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/567db44eaf81
branches:  trunk
changeset: 461275:567db44eaf81
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Sat Sep 13 13:53:31 2003 +0000

description:
_PERL_{INSTALLSITELIB,etc.} shouldn't be added to MAKEFLAGS since their
values change for every dependent package that you enter and invoke a
sub-make.

diffstat:

 lang/perl5/module.mk |  25 ++++++++++++++++---------
 1 files changed, 16 insertions(+), 9 deletions(-)

diffs (61 lines):

diff -r 8fdd33baeb3f -r 567db44eaf81 lang/perl5/module.mk
--- a/lang/perl5/module.mk      Sat Sep 13 12:24:08 2003 +0000
+++ b/lang/perl5/module.mk      Sat Sep 13 13:53:31 2003 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: module.mk,v 1.15 2003/09/13 08:25:03 jlam Exp $
+# $NetBSD: module.mk,v 1.16 2003/09/13 13:53:31 jlam Exp $
 #
 # This Makefile fragment is intended to be included by packages that build
 # and install perl5 modules.
@@ -34,7 +34,9 @@
 BUILDLINK_DEPMETHOD.perl+=     full
 
 .if !defined(NO_BUILDLINK)
-.  if empty(USE_BUILDLINK2:M[nN][oO])
+.  if empty(USE_BUILDLINK3:M[nN][oO])
+.    include "../../lang/perl5/buildlink3.mk"
+.  elif empty(USE_BUILDLINK2:M[nN][oO])
 .    include "../../lang/perl5/buildlink2.mk"
 .  endif
 .endif
@@ -65,6 +67,11 @@
 .  endif
 .endif
 
+_PERL5_SITEVARS=                                                       \
+       INSTALLSITEBIN INSTALLSITELIB INSTALLSITEARCH                   \
+       INSTALLSITEMAN1DIR INSTALLSITEMAN3DIR                           \
+       SITELIBEXP SITEARCHEXP
+
 .if !defined(_PERL5_SITEPREFIX)
 .  if exists(${PERL5})
 _PERL5_SITEPREFIX!=    \
@@ -82,21 +89,21 @@
 _PERL5_VAR.SITELIBEXP=         sitelibexp
 _PERL5_VAR.SITEARCHEXP=                sitearchexp
 
-.    for _var_ in                                                      \
-       INSTALLSITEBIN INSTALLSITELIB INSTALLSITEARCH                   \
-       INSTALLSITEMAN1DIR INSTALLSITEMAN3DIR                           \
-       SITELIBEXP SITEARCHEXP
+.    for _var_ in ${_PERL5_SITEVARS}
 _PERL5_SUB_${_var_}!=  \
        eval `${PERL5} -V:${_PERL5_VAR.${_var_}} 2>/dev/null`;          \
        ${ECHO} $${${_PERL5_VAR.${_var_}}} |                            \
        ${SED} -e "s,^${_PERL5_SITEPREFIX}/,,"
-_PERL5_${_var_}=       ${PREFIX}/${_PERL5_SUB_${_var_}}
-MAKEFLAGS+=    ${_var_}="${_PERL5_${_var_}}"
-MAKE_FLAGS+=   ${_var_}="${_PERL5_${_var_}}"
+MAKEFLAGS+=    _PERL5_SUB_${_var_}="${_PERL5_SUB_${_var_}}"
 .    endfor
 .  endif
 .endif
 
+.for _var_ in ${_PERL5_SITEVARS}
+_PERL5_${_var_}=       ${PREFIX}/${_PERL5_SUB_${_var_}}
+MAKE_FLAGS+=           ${_var_}="${_PERL5_${_var_}}"
+.endfor
+
 .if defined(DEFAULT_VIEW.perl)
 DEFAULT_VIEW.${PKGBASE}=       ${DEFAULT_VIEW.perl}
 .endif