diff options
| author | jlam <jlam@pkgsrc.org> | 2005-05-12 20:31:56 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-05-12 20:31:56 +0000 |
| commit | 69406c81f0832a975c91a7e8fb700f7499130e90 (patch) | |
| tree | 2f5efefb4ea44f1e5c389f2d578e8b2afb664cec /mk/bsd.pkg.use.mk | |
| parent | 280d2cd98e6c7b258da4b28fd4dca7146384e913 (diff) | |
| download | pkgsrc-69406c81f0832a975c91a7e8fb700f7499130e90.tar.gz | |
Don't check for whether variables are defined or not before adding
them to PLIST_SUBST. They may simply be defined later on in the
Makefile processing. Instead check whether USE_PERL5 was specified
to determine whether to pass along PERL5_{SITEARCH,SITELIB,ARCHLIB}
to PLIST_SUBST.
Diffstat (limited to 'mk/bsd.pkg.use.mk')
| -rw-r--r-- | mk/bsd.pkg.use.mk | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/mk/bsd.pkg.use.mk b/mk/bsd.pkg.use.mk index 779c994ef17..d3a8f8f1d1b 100644 --- a/mk/bsd.pkg.use.mk +++ b/mk/bsd.pkg.use.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.use.mk,v 1.8 2005/04/09 23:16:45 markd Exp $ +# $NetBSD: bsd.pkg.use.mk,v 1.9 2005/05/12 20:31:56 jlam Exp $ # # Turn USE_* macros into proper depedency logic. Included near the top of # bsd.pkg.mk, after bsd.prefs.mk. @@ -160,13 +160,9 @@ CONFIGURE_ENV+= PERL=${PERL5:Q} . include "../../lang/perl5/vars.mk" .endif # USE_PERL5 == run -.if defined(PERL5_SUB_INSTALLSITELIB) +.if defined(USE_PERL5) PLIST_SUBST+= PERL5_SITELIB=${PERL5_SUB_INSTALLSITELIB} -.endif -.if defined(PERL5_SUB_INSTALLSITEARCH) PLIST_SUBST+= PERL5_SITEARCH=${PERL5_SUB_INSTALLSITEARCH} -.endif -.if defined(PERL5_SUB_INSTALLARCHLIB) PLIST_SUBST+= PERL5_ARCHLIB=${PERL5_SUB_INSTALLARCHLIB} .endif |