Date: Wed, 8 Mar 2017 05:31:54 +0000 (UTC) From: Ngie Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r314893 - in head/usr.bin/fortune: . datfiles fortune unstr Message-ID: <201703080531.v285Vs1Y065051@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Wed Mar 8 05:31:54 2017 New Revision: 314893 URL: https://svnweb.freebsd.org/changeset/base/314893 Log: usr.bin/fortune: convert to OBJTOP/SRCTOP idioms - Use OBJTOP/SRCTOP-relative paths when looking for include files and strfile. - Add FORTUNES_OBJ and FORTUNES_SRC to abbreviate usr.bin/fortune pathing. This is being done to simplify make output/idioms. MFC after: 1 week Reviewed by: bdrewery Sponsored by: Dell EMC Isilon Differential Revision: D9916 Modified: head/usr.bin/fortune/Makefile.inc head/usr.bin/fortune/datfiles/Makefile head/usr.bin/fortune/fortune/Makefile head/usr.bin/fortune/unstr/Makefile Modified: head/usr.bin/fortune/Makefile.inc ============================================================================== --- head/usr.bin/fortune/Makefile.inc Wed Mar 8 05:27:04 2017 (r314892) +++ head/usr.bin/fortune/Makefile.inc Wed Mar 8 05:31:54 2017 (r314893) @@ -1,3 +1,6 @@ -.if exists(${.CURDIR}/../../Makefile.inc) -.include "${.CURDIR}/../../Makefile.inc" -.endif +# $FreeBSD$ + +FORTUNE_SRC= ${SRCTOP}/usr.bin/fortune +FORTUNE_OBJ= ${OBJTOP}/usr.bin/fortune + +.include "${SRCTOP}/usr.bin/Makefile.inc" Modified: head/usr.bin/fortune/datfiles/Makefile ============================================================================== --- head/usr.bin/fortune/datfiles/Makefile Wed Mar 8 05:27:04 2017 (r314892) +++ head/usr.bin/fortune/datfiles/Makefile Wed Mar 8 05:31:54 2017 (r314893) @@ -15,7 +15,7 @@ FILESDIR= ${SHAREDIR}/games/fortune .for f in ${DB} $f.dat: $f - PATH=$$PATH:/usr/bin:${.OBJDIR}/../strfile \ + PATH=$$PATH:/usr/bin:${FORTUNE_OBJ}/strfile \ strfile -Cs ${.ALLSRC} ${.TARGET} .endfor Modified: head/usr.bin/fortune/fortune/Makefile ============================================================================== --- head/usr.bin/fortune/fortune/Makefile Wed Mar 8 05:27:04 2017 (r314892) +++ head/usr.bin/fortune/fortune/Makefile Wed Mar 8 05:31:54 2017 (r314893) @@ -3,7 +3,7 @@ PROG= fortune MAN= fortune.6 -CFLAGS+=-DDEBUG -I${.CURDIR}/../strfile +CFLAGS+=-DDEBUG -I${FORTUNE_SRC}/strfile .include <bsd.prog.mk> Modified: head/usr.bin/fortune/unstr/Makefile ============================================================================== --- head/usr.bin/fortune/unstr/Makefile Wed Mar 8 05:27:04 2017 (r314892) +++ head/usr.bin/fortune/unstr/Makefile Wed Mar 8 05:31:54 2017 (r314893) @@ -3,6 +3,6 @@ PROG= unstr MAN= -CFLAGS+= -I${.CURDIR}/../strfile +CFLAGS+= -I${FORTUNE_SRC}/strfile .include <bsd.prog.mk>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201703080531.v285Vs1Y065051>