Date: Thu, 20 Jul 2017 00:50:01 +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-11@freebsd.org Subject: svn commit: r321266 - in stable/11/usr.bin/fortune: . datfiles fortune unstr Message-ID: <201707200050.v6K0o1rf030098@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Thu Jul 20 00:50:01 2017 New Revision: 321266 URL: https://svnweb.freebsd.org/changeset/base/321266 Log: MFC r314893: 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. Modified: stable/11/usr.bin/fortune/Makefile.inc stable/11/usr.bin/fortune/datfiles/Makefile stable/11/usr.bin/fortune/fortune/Makefile stable/11/usr.bin/fortune/unstr/Makefile Directory Properties: stable/11/ (props changed) Modified: stable/11/usr.bin/fortune/Makefile.inc ============================================================================== --- stable/11/usr.bin/fortune/Makefile.inc Thu Jul 20 00:48:04 2017 (r321265) +++ stable/11/usr.bin/fortune/Makefile.inc Thu Jul 20 00:50:01 2017 (r321266) @@ -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: stable/11/usr.bin/fortune/datfiles/Makefile ============================================================================== --- stable/11/usr.bin/fortune/datfiles/Makefile Thu Jul 20 00:48:04 2017 (r321265) +++ stable/11/usr.bin/fortune/datfiles/Makefile Thu Jul 20 00:50:01 2017 (r321266) @@ -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: stable/11/usr.bin/fortune/fortune/Makefile ============================================================================== --- stable/11/usr.bin/fortune/fortune/Makefile Thu Jul 20 00:48:04 2017 (r321265) +++ stable/11/usr.bin/fortune/fortune/Makefile Thu Jul 20 00:50:01 2017 (r321266) @@ -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: stable/11/usr.bin/fortune/unstr/Makefile ============================================================================== --- stable/11/usr.bin/fortune/unstr/Makefile Thu Jul 20 00:48:04 2017 (r321265) +++ stable/11/usr.bin/fortune/unstr/Makefile Thu Jul 20 00:50:01 2017 (r321266) @@ -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?201707200050.v6K0o1rf030098>