Date: Sat, 11 Feb 2017 06:25:48 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r313595 - in stable/10/lib/ncurses: . form formw menu menuw ncurses ncursesw panel panelw Message-ID: <201702110625.v1B6Pmta096983@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Sat Feb 11 06:25:47 2017 New Revision: 313595 URL: https://svnweb.freebsd.org/changeset/base/313595 Log: MFC r312467: Use SRCTOP-relative paths and .CURDIR with :H instead of ".." specified paths This implifies pathing in make/displayed output Modified: stable/10/lib/ncurses/config.mk stable/10/lib/ncurses/form/Makefile stable/10/lib/ncurses/formw/Makefile stable/10/lib/ncurses/menu/Makefile stable/10/lib/ncurses/menuw/Makefile stable/10/lib/ncurses/ncurses/Makefile stable/10/lib/ncurses/ncursesw/Makefile stable/10/lib/ncurses/panel/Makefile stable/10/lib/ncurses/panelw/Makefile Directory Properties: stable/10/ (props changed) Modified: stable/10/lib/ncurses/config.mk ============================================================================== --- stable/10/lib/ncurses/config.mk Sat Feb 11 06:23:07 2017 (r313594) +++ stable/10/lib/ncurses/config.mk Sat Feb 11 06:25:47 2017 (r313595) @@ -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: stable/10/lib/ncurses/form/Makefile ============================================================================== --- stable/10/lib/ncurses/form/Makefile Sat Feb 11 06:23:07 2017 (r313594) +++ stable/10/lib/ncurses/form/Makefile Sat Feb 11 06:25:47 2017 (r313595) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include "${.CURDIR}/../config.mk" +.include "${.CURDIR:H}/config.mk" SRCDIR= ${NCURSES_DIR}/form Modified: stable/10/lib/ncurses/formw/Makefile ============================================================================== --- stable/10/lib/ncurses/formw/Makefile Sat Feb 11 06:23:07 2017 (r313594) +++ stable/10/lib/ncurses/formw/Makefile Sat Feb 11 06:25:47 2017 (r313595) @@ -2,4 +2,4 @@ ENABLE_WIDEC= -.include "${.CURDIR}/../form/Makefile" +.include "${.CURDIR:H}/form/Makefile" Modified: stable/10/lib/ncurses/menu/Makefile ============================================================================== --- stable/10/lib/ncurses/menu/Makefile Sat Feb 11 06:23:07 2017 (r313594) +++ stable/10/lib/ncurses/menu/Makefile Sat Feb 11 06:25:47 2017 (r313595) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include "${.CURDIR}/../config.mk" +.include "${.CURDIR:H}/config.mk" SRCDIR= ${NCURSES_DIR}/menu Modified: stable/10/lib/ncurses/menuw/Makefile ============================================================================== --- stable/10/lib/ncurses/menuw/Makefile Sat Feb 11 06:23:07 2017 (r313594) +++ stable/10/lib/ncurses/menuw/Makefile Sat Feb 11 06:25:47 2017 (r313595) @@ -2,4 +2,4 @@ ENABLE_WIDEC= -.include "${.CURDIR}/../menu/Makefile" +.include "${.CURDIR:H}/menu/Makefile" Modified: stable/10/lib/ncurses/ncurses/Makefile ============================================================================== --- stable/10/lib/ncurses/ncurses/Makefile Sat Feb 11 06:23:07 2017 (r313594) +++ stable/10/lib/ncurses/ncurses/Makefile Sat Feb 11 06:25:47 2017 (r313595) @@ -8,7 +8,7 @@ NO_MAN= .include <bsd.own.mk> -.include "${.CURDIR}/../config.mk" +.include "${.CURDIR:H}/config.mk" LIB= ncurses${LIB_SUFFIX} SHLIB_MAJOR= 8 Modified: stable/10/lib/ncurses/ncursesw/Makefile ============================================================================== --- stable/10/lib/ncurses/ncursesw/Makefile Sat Feb 11 06:23:07 2017 (r313594) +++ stable/10/lib/ncurses/ncursesw/Makefile Sat Feb 11 06:25:47 2017 (r313595) @@ -2,6 +2,6 @@ ENABLE_WIDEC= -.PATH: ${.CURDIR}/../ncurses +.PATH: ${.CURDIR:H}/ncurses -.include "${.CURDIR}/../ncurses/Makefile" +.include "${.CURDIR:H}/ncurses/Makefile" Modified: stable/10/lib/ncurses/panel/Makefile ============================================================================== --- stable/10/lib/ncurses/panel/Makefile Sat Feb 11 06:23:07 2017 (r313594) +++ stable/10/lib/ncurses/panel/Makefile Sat Feb 11 06:25:47 2017 (r313595) @@ -1,6 +1,6 @@ # $FreeBSD$ -.include "${.CURDIR}/../config.mk" +.include "${.CURDIR:H}/config.mk" SRCDIR= ${NCURSES_DIR}/panel Modified: stable/10/lib/ncurses/panelw/Makefile ============================================================================== --- stable/10/lib/ncurses/panelw/Makefile Sat Feb 11 06:23:07 2017 (r313594) +++ stable/10/lib/ncurses/panelw/Makefile Sat Feb 11 06:25:47 2017 (r313595) @@ -2,4 +2,4 @@ ENABLE_WIDEC= -.include "${.CURDIR}/../panel/Makefile" +.include "${.CURDIR:H}/panel/Makefile"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201702110625.v1B6Pmta096983>