diff options
| author | jlam <jlam> | 2005-05-20 03:00:16 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2005-05-20 03:00:16 +0000 |
| commit | 31e40cd6b3726b49aa0c5ce2f45541ec06bdf40e (patch) | |
| tree | 89bc3019c9623f045d4ed22565ab2402949dd26e | |
| parent | d8c8ca124f615b46cb13ac4eafb7f81b1e2886ea (diff) | |
| download | pkgsrc-31e40cd6b3726b49aa0c5ce2f45541ec06bdf40e.tar.gz | |
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.
| -rw-r--r-- | lang/perl5/module.mk | 6 | ||||
| -rw-r--r-- | mk/tools/perl.mk | 7 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lang/perl5/module.mk b/lang/perl5/module.mk index 6bd4fd18b15..9b0273b33ab 100644 --- a/lang/perl5/module.mk +++ b/lang/perl5/module.mk @@ -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:S/-Wl,//g}" 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 --git a/mk/tools/perl.mk b/mk/tools/perl.mk index fa492ef317f..214b1adce75 100644 --- a/mk/tools/perl.mk +++ b/mk/tools/perl.mk @@ -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 @@ CONFIGURE_ENV+= PERL=${TOOLS_${_TOOLS_VARNAME.perl}:Q} # 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 |