diff options
| author | jlam <jlam> | 2003-09-13 13:53:31 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2003-09-13 13:53:31 +0000 |
| commit | 0056fc5fb5336f26d58f499bc40015f236076f93 (patch) | |
| tree | cc44e63da6725d342197e54a39a99869730b9bda /lang/perl5 | |
| parent | 675e20b0c8c66021ec1773c6a27756e63d6740dc (diff) | |
| download | pkgsrc-0056fc5fb5336f26d58f499bc40015f236076f93.tar.gz | |
_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 (limited to 'lang/perl5')
| -rw-r--r-- | lang/perl5/module.mk | 25 |
1 files changed, 16 insertions, 9 deletions
diff --git a/lang/perl5/module.mk b/lang/perl5/module.mk index e2170f25b80..d554b15bb41 100644 --- a/lang/perl5/module.mk +++ b/lang/perl5/module.mk @@ -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 @@ _PERL5_MODULE_MK= # defined 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 @@ do-configure: perl5-configure . 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.INSTALLSITEMAN3DIR= installsiteman3dir _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 |