[Midnightbsd-cvs] src [10610] trunk/lib/ncurses: fix path

[laffer1 at midnightbsd.org]

Revision: 10610
          http://svnweb.midnightbsd.org/src/?rev=10610
Author:   laffer1
Date:     2018-06-09 11:21:17 -0400 (Sat, 09 Jun 2018)
Log Message:
-----------
fix path

Modified Paths:
--------------
    trunk/lib/ncurses/config.mk
    trunk/lib/ncurses/form/Makefile

Modified: trunk/lib/ncurses/config.mk
===================================================================
--- trunk/lib/ncurses/config.mk	2018-06-09 15:20:55 UTC (rev 10609)
+++ trunk/lib/ncurses/config.mk	2018-06-09 15:21:17 UTC (rev 10610)
@@ -1,13 +1,14 @@
-# $MidnightBSD: src/lib/ncurses/config.mk,v 1.3 2008/10/05 18:18:56 laffer1 Exp $
+# $MidnightBSD$
+# $FreeBSD: stable/10/lib/ncurses/config.mk 313595 2017-02-11 06:25:47Z ngie $
 
 # This Makefile is shared by libncurses, libform, libmenu, libpanel.
 
-NCURSES_DIR=	${.CURDIR}/../../../contrib/ncurses
+NCURSES_DIR=	${SRCTOP}/contrib/ncurses
 
 .if defined(ENABLE_WIDEC)
 LIB_SUFFIX=	w
 CFLAGS+=	-D_XOPEN_SOURCE_EXTENDED -DENABLE_WIDEC
-NCURSES_CFG_H=	${.CURDIR}/../ncurses/ncurses_cfg.h
+NCURSES_CFG_H=	${.CURDIR:H}/ncurses/ncurses_cfg.h
 .else
 LIB_SUFFIX=
 NCURSES_CFG_H=	${.CURDIR}/ncurses_cfg.h
@@ -14,13 +15,13 @@
 .endif
 
 CFLAGS+=	-I.
-.if exists(${.OBJDIR}/../ncurses${LIB_SUFFIX})
-CFLAGS+=	-I${.OBJDIR}/../ncurses${LIB_SUFFIX}
+.if exists(${.OBJDIR:H}/ncurses${LIB_SUFFIX})
+CFLAGS+=	-I${.OBJDIR:H}/ncurses${LIB_SUFFIX}
 .endif
-CFLAGS+=	-I${.CURDIR}/../ncurses${LIB_SUFFIX}
+CFLAGS+=	-I${.CURDIR:H}/ncurses${LIB_SUFFIX}
 
 # for ${NCURSES_CFG_H}
-CFLAGS+=	-I${.CURDIR}/../ncurses
+CFLAGS+=	-I${.CURDIR:H}/ncurses
 
 CFLAGS+=	-I${NCURSES_DIR}/include
 CFLAGS+=	-I${NCURSES_DIR}/ncurses

Modified: trunk/lib/ncurses/form/Makefile
===================================================================
--- trunk/lib/ncurses/form/Makefile	2018-06-09 15:20:55 UTC (rev 10609)
+++ trunk/lib/ncurses/form/Makefile	2018-06-09 15:21:17 UTC (rev 10610)
@@ -1,6 +1,7 @@
 # $MidnightBSD$
+# $FreeBSD: stable/10/lib/ncurses/form/Makefile 313595 2017-02-11 06:25:47Z ngie $
 
-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"
 
 SRCDIR=	${NCURSES_DIR}/form
 
@@ -54,7 +55,7 @@
 CFLAGS+=	-I${SRCDIR}
 CFLAGS+=	-I${NCURSES_DIR}/menu
 
-DPADD=	${LIBNCURSES${LIB_SUFFIX:U}}
+DPADD=	${LIBNCURSES${LIB_SUFFIX:tu}}
 LDADD=	-lncurses${LIB_SUFFIX}
 
 .if defined(ENABLE_WIDEC)
@@ -157,7 +158,7 @@
 	form_win.3 set_form_sub.3 \
 	form_win.3 set_form_win.3
 .else
-NO_MAN=
+MAN=
 .endif
 
 .include <bsd.lib.mk>