diff options
| author | obache <obache@pkgsrc.org> | 2013-06-17 05:44:27 +0000 |
|---|---|---|
| committer | obache <obache@pkgsrc.org> | 2013-06-17 05:44:27 +0000 |
| commit | e2795749a8e77576bf5a82dfb30854006e6be34f (patch) | |
| tree | cf69a82ee4f6ab842c6636c360e5a70aac7d9525 /mk | |
| parent | c288b23f7102e342bfd66333e69634071d9389a2 (diff) | |
| download | pkgsrc-e2795749a8e77576bf5a82dfb30854006e6be34f.tar.gz | |
Change condition of builtin termcap detection to same as termcap implementation
detection, so that `term fuction is in libc' and `only shlib, no development
environment' will be handled correctly.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/termcap.builtin.mk | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/mk/termcap.builtin.mk b/mk/termcap.builtin.mk index b3a51100825..5568dc2b759 100644 --- a/mk/termcap.builtin.mk +++ b/mk/termcap.builtin.mk @@ -1,4 +1,4 @@ -# $NetBSD: termcap.builtin.mk,v 1.8 2012/10/31 03:28:40 asau Exp $ +# $NetBSD: termcap.builtin.mk,v 1.9 2013/06/17 05:44:27 obache Exp $ BUILTIN_PKG:= termcap @@ -19,11 +19,10 @@ BUILTIN_FIND_GREP.H_TERMLIB:= tgetent ### .if !defined(IS_BUILTIN.termcap) IS_BUILTIN.termcap= no -. if !empty(BUILTIN_LIB_FOUND.terminfo:M[yY][eE][sS]) || \ - !empty(BUILTIN_LIB_FOUND.curses:M[yY][eE][sS]) || \ - !empty(BUILTIN_LIB_FOUND.termcap:M[yY][eE][sS]) || \ - !empty(BUILTIN_LIB_FOUND.termlib:M[yY][eE][sS]) || \ - !empty(BUILTIN_LIB_FOUND.tinfo:M[yY][eE][sS]) +. if empty(H_TERM:M__nonexistent__) && empty(H_TERM:M${LOCALBASE}/*) || \ + empty(H_TERMCAP:M__nonexistent__) && empty(H_TERMCAP:M${LOCALBASE}/*) || \ + empty(H_TERMLIB:M__nonexistent__) && empty(H_TERMLIB:M${LOCALBASE}/*) || \ + !empty(BUILTIN_LIB_FOUND.termlib:M[yY][eE][sS]) IS_BUILTIN.termcap= yes . endif .endif |