aboutsummaryrefslogtreecommitdiff
path: root/lib/ncurses
diff options
context:
space:
mode:
Diffstat (limited to 'lib/ncurses')
-rw-r--r--lib/ncurses/config.mk12
-rw-r--r--lib/ncurses/form/Makefile2
-rw-r--r--lib/ncurses/formw/Makefile2
-rw-r--r--lib/ncurses/menu/Makefile2
-rw-r--r--lib/ncurses/menuw/Makefile2
-rw-r--r--lib/ncurses/ncurses/Makefile2
-rw-r--r--lib/ncurses/ncursesw/Makefile4
-rw-r--r--lib/ncurses/panel/Makefile2
-rw-r--r--lib/ncurses/panelw/Makefile2
9 files changed, 15 insertions, 15 deletions
diff --git a/lib/ncurses/config.mk b/lib/ncurses/config.mk
index d01e17a413bd..d15be8601136 100644
--- a/lib/ncurses/config.mk
+++ b/lib/ncurses/config.mk
@@ -2,25 +2,25 @@
# 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
.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
diff --git a/lib/ncurses/form/Makefile b/lib/ncurses/form/Makefile
index beefb2c4a7d2..eab5bbb63c09 100644
--- a/lib/ncurses/form/Makefile
+++ b/lib/ncurses/form/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"
SRCDIR= ${NCURSES_DIR}/form
diff --git a/lib/ncurses/formw/Makefile b/lib/ncurses/formw/Makefile
index 54885034ff39..3ec7637373be 100644
--- a/lib/ncurses/formw/Makefile
+++ b/lib/ncurses/formw/Makefile
@@ -2,4 +2,4 @@
ENABLE_WIDEC=
-.include "${.CURDIR}/../form/Makefile"
+.include "${.CURDIR:H}/form/Makefile"
diff --git a/lib/ncurses/menu/Makefile b/lib/ncurses/menu/Makefile
index d3890de73e36..653619638fbc 100644
--- a/lib/ncurses/menu/Makefile
+++ b/lib/ncurses/menu/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"
SRCDIR= ${NCURSES_DIR}/menu
diff --git a/lib/ncurses/menuw/Makefile b/lib/ncurses/menuw/Makefile
index d5a100f0cffd..d6df56332826 100644
--- a/lib/ncurses/menuw/Makefile
+++ b/lib/ncurses/menuw/Makefile
@@ -2,4 +2,4 @@
ENABLE_WIDEC=
-.include "${.CURDIR}/../menu/Makefile"
+.include "${.CURDIR:H}/menu/Makefile"
diff --git a/lib/ncurses/ncurses/Makefile b/lib/ncurses/ncurses/Makefile
index f8649ccf03d3..d880ebb8d00d 100644
--- a/lib/ncurses/ncurses/Makefile
+++ b/lib/ncurses/ncurses/Makefile
@@ -10,7 +10,7 @@ MK_MAN=no
.include <src.opts.mk>
-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"
LIB= ncurses${LIB_SUFFIX}
SHLIB_MAJOR= 8
diff --git a/lib/ncurses/ncursesw/Makefile b/lib/ncurses/ncursesw/Makefile
index 277c90b2f073..5f6040e7119c 100644
--- a/lib/ncurses/ncursesw/Makefile
+++ b/lib/ncurses/ncursesw/Makefile
@@ -2,6 +2,6 @@
ENABLE_WIDEC=
-.PATH: ${.CURDIR}/../ncurses
+.PATH: ${.CURDIR:H}/ncurses
-.include "${.CURDIR}/../ncurses/Makefile"
+.include "${.CURDIR:H}/ncurses/Makefile"
diff --git a/lib/ncurses/panel/Makefile b/lib/ncurses/panel/Makefile
index b075bcf056af..1993f5e76ac2 100644
--- a/lib/ncurses/panel/Makefile
+++ b/lib/ncurses/panel/Makefile
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"
SRCDIR= ${NCURSES_DIR}/panel
diff --git a/lib/ncurses/panelw/Makefile b/lib/ncurses/panelw/Makefile
index 7642e34906f7..2585738a5e60 100644
--- a/lib/ncurses/panelw/Makefile
+++ b/lib/ncurses/panelw/Makefile
@@ -2,4 +2,4 @@
ENABLE_WIDEC=
-.include "${.CURDIR}/../panel/Makefile"
+.include "${.CURDIR:H}/panel/Makefile"