diff options
| author | jlam <jlam@pkgsrc.org> | 2008-02-27 15:26:34 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2008-02-27 15:26:34 +0000 |
| commit | 496391a1f05f91dbaaae1b01c164490ff0a6348a (patch) | |
| tree | e7f6683c2de59045f2b7a5c73f989de2cc8dc921 /mk/curses.builtin.mk | |
| parent | 7f76795a112df6d59acbbe7ed410166e9e4844fc (diff) | |
| download | pkgsrc-496391a1f05f91dbaaae1b01c164490ff0a6348a.tar.gz | |
+ 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.
Diffstat (limited to 'mk/curses.builtin.mk')
| -rw-r--r-- | mk/curses.builtin.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mk/curses.builtin.mk b/mk/curses.builtin.mk index e1e812ebc2a..df34f269451 100644 --- a/mk/curses.builtin.mk +++ b/mk/curses.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: curses.builtin.mk,v 1.4 2008/02/27 06:14:23 jlam Exp $ +# $NetBSD: curses.builtin.mk,v 1.5 2008/02/27 15:26:34 jlam Exp $ BUILTIN_PKG:= curses @@ -46,13 +46,11 @@ 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. +# Define BUILTIN_LIBNAME.curses to be the base name of the built-in +# curses library. # -.if !empty(USE_BUILTIN.curses:M[yY][eE][sS]) -. if !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS]) +.if !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS]) BUILTIN_LIBNAME.curses= curses -. endif .endif ### @@ -66,6 +64,7 @@ CHECK_BUILTIN.curses?= no . if exists(${H_CURSES}) BUILDLINK_INCDIRS.curses?= ${H_CURSES:H:S/^${BUILDLINK_PREFIX.curses}\///} . endif +BUILDLINK_LIBNAME.curses= ${BUILTIN_LIBNAME.curses} . endif .endif # CHECK_BUILTIN.curses |