+ Define BUILTIN_LIBNAME.* unconditionally so that their values can

  always be used in other builtin.mk files.

+ In the USE_BUILTIN.* == "yes" case, set BUILDLINK_LIBNAME.* to the
  corresponding BUILTIN_LIBNAME.* value so that BUILDLINK_LIBNAME.*
  can always be used in other buildlink3.mk files.

1 files changed, 9 insertions, 10 deletions

diff --git a/devel/ncurses/builtin.mk b/devel/ncurses/builtin.mk
index 2a543cea722..ec54325f293 100644
--- a/devel/ncurses/builtin.mk
+++ b/devel/ncurses/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.18 2008/02/27 06:14:23 jlam Exp $
+# $NetBSD: builtin.mk,v 1.19 2008/02/27 15:26:34 jlam Exp $
 
 BUILTIN_PKG:=	ncurses
 
@@ -100,23 +100,21 @@ USE_BUILTIN.ncurses=	no
 .  endif
 .endif
 
-# Define BUILTIN_LIBNAME.ncurses to be the built-in ncurses library
-# only if we're using the built-in ncurses.
+# Define BUILTIN_LIBNAME.ncurses to be the base name of the built-in
+# ncurses library.
 #
-.if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS])
-.  if !empty(BUILTIN_LIB_FOUND.ncurses:M[nN][oO]) && \
-      !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
+.if !empty(BUILTIN_LIB_FOUND.ncurses:M[nN][oO]) && \
+    !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
 BUILTIN_LIBNAME.ncurses=	curses
-.  endif
+.endif
 #
 # On Interix, there is a libncurses.a and a libcurses.so but strangely,
 # no libncurses.so.  We want to link against the shared library, so
 # turn "-lncurses" into "-lcurses".
 #
-.  if (${OPSYS} == "Interix") && \
-      !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
+.if (${OPSYS} == "Interix") && \
+    !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS])
 BUILTIN_LIBNAME.ncurses=	curses
-.  endif
 .endif
 
 ###
@@ -128,6 +126,7 @@ CHECK_BUILTIN.ncurses?=	no
 
 BUILDLINK_TRANSFORM+=		l:ncurses:${BUILDLINK_LIBNAME.ncurses}
 .  if !empty(USE_BUILTIN.ncurses:M[yY][eE][sS])
+BUILDLINK_LIBNAME.ncurses=	${BUILTIN_LIBNAME.ncurses}
 BUILDLINK_TARGETS+=		buildlink-curses-ncurses-h
 BUILDLINK_TARGETS+=		buildlink-ncurses-extra-includes
 .  endif