summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorcube <cube>2008-09-28 03:56:26 +0000
committercube <cube>2008-09-28 03:56:26 +0000
commit8ffbe9199fea03db031c2dad72fac9a82a89a09c (patch)
tree8fb567f0abfb32ec20c1a5fc7ecb08c38518a8dc
parent6e9beac84647da33a5a277ece059d5a6a464d583 (diff)
downloadpkgsrc-8ffbe9199fea03db031c2dad72fac9a82a89a09c.tar.gz
Implement a work around for what seems to be a bug in make(1).
'CHECK_BUILTIN.${BUILTIN_PKG}?= no' would set the variable to no even if it had a value before.
-rw-r--r--mk/x11.builtin.mk9
1 files changed, 7 insertions, 2 deletions
diff --git a/mk/x11.builtin.mk b/mk/x11.builtin.mk
index 5dceeb19c5c..329ad94e423 100644
--- a/mk/x11.builtin.mk
+++ b/mk/x11.builtin.mk
@@ -1,11 +1,16 @@
-# $NetBSD: x11.builtin.mk,v 1.2.20.1 2008/09/26 19:58:13 cube Exp $
+# $NetBSD: x11.builtin.mk,v 1.2.20.2 2008/09/28 03:56:26 cube Exp $
#
# x11.builtin.mk will include the builtin.mk file from the appropriate
# X11 distribution.
#
# BUILTIN_PKG and USE_BUILTIN.<BUILTIN_PKG> must be defined by the caller
-CHECK_BUILTIN.${BUILTIN_PKG}?= no
+# XXX make bug
+# 'CHECK_BUILTIN.${BUILTIN_PKG}?= no' will overwrite the value
+.if !defined(CHECK_BUILTIN.${BUILTIN_PKG})
+CHECK_BUILTIN.${BUILTIN_PKG}= no
+.endif
+
.if !empty(CHECK_BUILTIN.${BUILTIN_PKG}:M[Nn][Oo])
. if !empty(USE_BUILTIN.${BUILTIN_PKG}:M[Yy][Ee][Ss])