summaryrefslogtreecommitdiff
path: root/mk/wrapper
diff options
context:
space:
mode:
authorjperkin <jperkin@pkgsrc.org>2015-04-29 14:23:23 +0000
committerjperkin <jperkin@pkgsrc.org>2015-04-29 14:23:23 +0000
commita2de36f2cd60799556a741533985d0215f4cdaed (patch)
treed2888097deec89d2d8b8b5dd4187ce41abc3b26b /mk/wrapper
parent13d147025c9bb1e979961d6075efedaa14f69e93 (diff)
downloadpkgsrc-a2de36f2cd60799556a741533985d0215f4cdaed.tar.gz
Introduce _USE_CWRAPPERS logic to ensure consistency, USE_CWRAPPERS could
differ between a package and user setting, resulting in incorrect WRAPPER_* values being set from wrapper-defs.mk.
Diffstat (limited to 'mk/wrapper')
-rw-r--r--mk/wrapper/wrapper-defs.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/mk/wrapper/wrapper-defs.mk b/mk/wrapper/wrapper-defs.mk
index d6de5c7477a..36abf2b7292 100644
--- a/mk/wrapper/wrapper-defs.mk
+++ b/mk/wrapper/wrapper-defs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: wrapper-defs.mk,v 1.4 2015/04/28 21:15:01 jperkin Exp $
+# $NetBSD: wrapper-defs.mk,v 1.5 2015/04/29 14:23:23 jperkin Exp $
#
# Copyright (c) 2004 The NetBSD Foundation, Inc.
# All rights reserved.
@@ -37,7 +37,7 @@
.if !defined(WRAPPER_DEFS_MK)
WRAPPER_DEFS_MK= defined
-.if ${USE_CWRAPPERS:tl} != "no"
+.if ${_USE_CWRAPPERS} == "yes"
WRAPPER_DIR= ${WRKDIR}/.cwrapper
WRAPPER_BINDIR= ${WRAPPER_DIR}/bin
.else