summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam@pkgsrc.org>2008-02-27 06:14:23 +0000
committerjlam <jlam@pkgsrc.org>2008-02-27 06:14:23 +0000
commit70c7f36d9943ac736f19824fe03a14c5a3427a6d (patch)
treeb43b2ecc49659779b4916d89c5a163d2512cd711 /mk
parent02629b7349f729b562b5f21762c64706c0f91a34 (diff)
downloadpkgsrc-70c7f36d9943ac736f19824fe03a14c5a3427a6d.tar.gz
Define BUILTIN_LIBNAME.* outside of the CHECK_BUILTIN.*-protected
section to be the name of the built-in library if USE_BUILTIN.* is "yes". These variables can be used in other builtin.mk files.
Diffstat (limited to 'mk')
-rw-r--r--mk/curses.builtin.mk15
1 files changed, 10 insertions, 5 deletions
diff --git a/mk/curses.builtin.mk b/mk/curses.builtin.mk
index e35b4ee4da3..e1e812ebc2a 100644
--- a/mk/curses.builtin.mk
+++ b/mk/curses.builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: curses.builtin.mk,v 1.3 2008/02/27 04:47:02 jlam Exp $
+# $NetBSD: curses.builtin.mk,v 1.4 2008/02/27 06:14:23 jlam Exp $
BUILTIN_PKG:= curses
@@ -46,6 +46,15 @@ USE_BUILTIN.curses!= \
.endif
MAKEVARS+= USE_BUILTIN.curses
+# Define BUILTIN_LIBNAME.curses to be the built-in curses library only if
+# we're using the built-in curses.
+#
+.if !empty(USE_BUILTIN.curses:M[yY][eE][sS])
+. if !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
+BUILTIN_LIBNAME.curses= curses
+. endif
+.endif
+
###
### The section below only applies if we are not including this file
### solely to determine whether a built-in implementation exists.
@@ -57,10 +66,6 @@ CHECK_BUILTIN.curses?= no
. if exists(${H_CURSES})
BUILDLINK_INCDIRS.curses?= ${H_CURSES:H:S/^${BUILDLINK_PREFIX.curses}\///}
. endif
-. if !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
-BUILDLINK_LIBNAME.curses= curses
-BUILDLINK_LDADD.curses?= -l${BUILDLINK_LIBNAME.curses}
-. endif
. endif
.endif # CHECK_BUILTIN.curses