diff options
| author | jperkin <jperkin@pkgsrc.org> | 2015-04-28 21:15:01 +0000 |
|---|---|---|
| committer | jperkin <jperkin@pkgsrc.org> | 2015-04-28 21:15:01 +0000 |
| commit | 9908505e5d1163593f5f02a5e237383662dc6678 (patch) | |
| tree | 68b3ff7ee239f84b02b0af44226084251dacd59a /mk/wrapper | |
| parent | 7a7ed169f40ff84a3bf2d0e686a9ab60ebbe24c2 (diff) | |
| download | pkgsrc-9908505e5d1163593f5f02a5e237383662dc6678.tar.gz | |
Move cwrappers WRAPPER_DIR and WRAPPER_BINDIR to wrapper-defs.mk, it is
included by bsd.prefs.mk so we need to ensure consistency.
Diffstat (limited to 'mk/wrapper')
| -rw-r--r-- | mk/wrapper/wrapper-defs.mk | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mk/wrapper/wrapper-defs.mk b/mk/wrapper/wrapper-defs.mk index 06556d6bb53..d6de5c7477a 100644 --- a/mk/wrapper/wrapper-defs.mk +++ b/mk/wrapper/wrapper-defs.mk @@ -1,4 +1,4 @@ -# $NetBSD: wrapper-defs.mk,v 1.3 2009/05/06 10:28:01 tron Exp $ +# $NetBSD: wrapper-defs.mk,v 1.4 2015/04/28 21:15:01 jperkin Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -37,11 +37,16 @@ .if !defined(WRAPPER_DEFS_MK) WRAPPER_DEFS_MK= defined +.if ${USE_CWRAPPERS:tl} != "no" +WRAPPER_DIR= ${WRKDIR}/.cwrapper +WRAPPER_BINDIR= ${WRAPPER_DIR}/bin +.else WRAPPER_DIR= ${WRKDIR}/.wrapper WRAPPER_BINDIR= ${WRAPPER_DIR}/bin WRAPPER_TMPDIR= ${WRAPPER_DIR}/tmp WRAPPER_SRCDIR= ${.CURDIR}/../../mk/wrapper WRAPPER_BIN_SH?= ${SH} WRAPPER_SHELL?= ${WRAPPER_BIN_SH} +.endif .endif # WRAPPER_DEFS_MK |