pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/mk Don't check for whether variables are defined or no...
details: https://anonhg.NetBSD.org/pkgsrc/rev/8411f785aaad
branches: trunk
changeset: 493704:8411f785aaad
user: jlam <jlam%pkgsrc.org@localhost>
date: Thu May 12 20:31:56 2005 +0000
description:
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:
mk/bsd.pkg.use.mk | 8 ++------
1 files changed, 2 insertions(+), 6 deletions(-)
diffs (24 lines):
diff -r c68905b4b34d -r 8411f785aaad mk/bsd.pkg.use.mk
--- a/mk/bsd.pkg.use.mk Thu May 12 20:20:21 2005 +0000
+++ b/mk/bsd.pkg.use.mk Thu May 12 20:31:56 2005 +0000
@@ -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 @@
. 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
Home |
Main Index |
Thread Index |
Old Index