svn commit: r312467 - in head/lib/ncurses: . form formw menu menuw ncurses ncursesw panel panelw
Ngie Cooper
ngie at FreeBSD.org
Fri Jan 20 04:27:42 UTC 2017
Author: ngie
Date: Fri Jan 20 04:27:40 2017
New Revision: 312467
URL: https://svnweb.freebsd.org/changeset/base/312467
Log:
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
Modified:
head/lib/ncurses/config.mk
head/lib/ncurses/form/Makefile
head/lib/ncurses/formw/Makefile
head/lib/ncurses/menu/Makefile
head/lib/ncurses/menuw/Makefile
head/lib/ncurses/ncurses/Makefile
head/lib/ncurses/ncursesw/Makefile
head/lib/ncurses/panel/Makefile
head/lib/ncurses/panelw/Makefile
Modified: head/lib/ncurses/config.mk
==============================================================================
--- head/lib/ncurses/config.mk Fri Jan 20 04:04:25 2017 (r312466)
+++ head/lib/ncurses/config.mk Fri Jan 20 04:27:40 2017 (r312467)
@@ -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
Modified: head/lib/ncurses/form/Makefile
==============================================================================
--- head/lib/ncurses/form/Makefile Fri Jan 20 04:04:25 2017 (r312466)
+++ head/lib/ncurses/form/Makefile Fri Jan 20 04:27:40 2017 (r312467)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"
SRCDIR= ${NCURSES_DIR}/form
Modified: head/lib/ncurses/formw/Makefile
==============================================================================
--- head/lib/ncurses/formw/Makefile Fri Jan 20 04:04:25 2017 (r312466)
+++ head/lib/ncurses/formw/Makefile Fri Jan 20 04:27:40 2017 (r312467)
@@ -2,4 +2,4 @@
ENABLE_WIDEC=
-.include "${.CURDIR}/../form/Makefile"
+.include "${.CURDIR:H}/form/Makefile"
Modified: head/lib/ncurses/menu/Makefile
==============================================================================
--- head/lib/ncurses/menu/Makefile Fri Jan 20 04:04:25 2017 (r312466)
+++ head/lib/ncurses/menu/Makefile Fri Jan 20 04:27:40 2017 (r312467)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"
SRCDIR= ${NCURSES_DIR}/menu
Modified: head/lib/ncurses/menuw/Makefile
==============================================================================
--- head/lib/ncurses/menuw/Makefile Fri Jan 20 04:04:25 2017 (r312466)
+++ head/lib/ncurses/menuw/Makefile Fri Jan 20 04:27:40 2017 (r312467)
@@ -2,4 +2,4 @@
ENABLE_WIDEC=
-.include "${.CURDIR}/../menu/Makefile"
+.include "${.CURDIR:H}/menu/Makefile"
Modified: head/lib/ncurses/ncurses/Makefile
==============================================================================
--- head/lib/ncurses/ncurses/Makefile Fri Jan 20 04:04:25 2017 (r312466)
+++ head/lib/ncurses/ncurses/Makefile Fri Jan 20 04:27:40 2017 (r312467)
@@ -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
Modified: head/lib/ncurses/ncursesw/Makefile
==============================================================================
--- head/lib/ncurses/ncursesw/Makefile Fri Jan 20 04:04:25 2017 (r312466)
+++ head/lib/ncurses/ncursesw/Makefile Fri Jan 20 04:27:40 2017 (r312467)
@@ -2,6 +2,6 @@
ENABLE_WIDEC=
-.PATH: ${.CURDIR}/../ncurses
+.PATH: ${.CURDIR:H}/ncurses
-.include "${.CURDIR}/../ncurses/Makefile"
+.include "${.CURDIR:H}/ncurses/Makefile"
Modified: head/lib/ncurses/panel/Makefile
==============================================================================
--- head/lib/ncurses/panel/Makefile Fri Jan 20 04:04:25 2017 (r312466)
+++ head/lib/ncurses/panel/Makefile Fri Jan 20 04:27:40 2017 (r312467)
@@ -1,6 +1,6 @@
# $FreeBSD$
-.include "${.CURDIR}/../config.mk"
+.include "${.CURDIR:H}/config.mk"
SRCDIR= ${NCURSES_DIR}/panel
Modified: head/lib/ncurses/panelw/Makefile
==============================================================================
--- head/lib/ncurses/panelw/Makefile Fri Jan 20 04:04:25 2017 (r312466)
+++ head/lib/ncurses/panelw/Makefile Fri Jan 20 04:27:40 2017 (r312467)
@@ -2,4 +2,4 @@
ENABLE_WIDEC=
-.include "${.CURDIR}/../panel/Makefile"
+.include "${.CURDIR:H}/panel/Makefile"
More information about the svn-src-all
mailing list