Use SRCTOP-relative paths and .CURDIR with :H instead of ".." specified paths
This implifies pathing in make/displayed output MFC after: 3 weeks Sponsored by: Dell EMC Isilon
This commit is contained in:
parent
f623ad832c
commit
5bde33db9d
@ -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
|
||||
|
@ -1,6 +1,6 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.include "${.CURDIR}/../config.mk"
|
||||
.include "${.CURDIR:H}/config.mk"
|
||||
|
||||
SRCDIR= ${NCURSES_DIR}/form
|
||||
|
||||
|
@ -2,4 +2,4 @@
|
||||
|
||||
ENABLE_WIDEC=
|
||||
|
||||
.include "${.CURDIR}/../form/Makefile"
|
||||
.include "${.CURDIR:H}/form/Makefile"
|
||||
|
@ -1,6 +1,6 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.include "${.CURDIR}/../config.mk"
|
||||
.include "${.CURDIR:H}/config.mk"
|
||||
|
||||
SRCDIR= ${NCURSES_DIR}/menu
|
||||
|
||||
|
@ -2,4 +2,4 @@
|
||||
|
||||
ENABLE_WIDEC=
|
||||
|
||||
.include "${.CURDIR}/../menu/Makefile"
|
||||
.include "${.CURDIR:H}/menu/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
|
||||
|
@ -2,6 +2,6 @@
|
||||
|
||||
ENABLE_WIDEC=
|
||||
|
||||
.PATH: ${.CURDIR}/../ncurses
|
||||
.PATH: ${.CURDIR:H}/ncurses
|
||||
|
||||
.include "${.CURDIR}/../ncurses/Makefile"
|
||||
.include "${.CURDIR:H}/ncurses/Makefile"
|
||||
|
@ -1,6 +1,6 @@
|
||||
# $FreeBSD$
|
||||
|
||||
.include "${.CURDIR}/../config.mk"
|
||||
.include "${.CURDIR:H}/config.mk"
|
||||
|
||||
SRCDIR= ${NCURSES_DIR}/panel
|
||||
|
||||
|
@ -2,4 +2,4 @@
|
||||
|
||||
ENABLE_WIDEC=
|
||||
|
||||
.include "${.CURDIR}/../panel/Makefile"
|
||||
.include "${.CURDIR:H}/panel/Makefile"
|
||||
|
Loading…
Reference in New Issue
Block a user