hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-12-27 05:21:08 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

usr.bin/fortune: convert to OBJTOP/SRCTOP idioms

Browse Source 
- 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
This commit is contained in:
Enji Cooper 2017-03-08 05:31:54 +00:00
parent 05de3f339a
commit cbd30a72ca
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=314893
4 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
usr.bin/fortune/Makefile.inc
View File

@ -1,3 +1,6 @@
.if exists(${.CURDIR}/../../Makefile.inc) # $FreeBSD$
.include "${.CURDIR}/../../Makefile.inc"
.endif FORTUNE_SRC= ${SRCTOP}/usr.bin/fortune
FORTUNE_OBJ= ${OBJTOP}/usr.bin/fortune
.include "${SRCTOP}/usr.bin/Makefile.inc"

2
usr.bin/fortune/datfiles/Makefile
View File

@ -15,7 +15,7 @@ FILESDIR= ${SHAREDIR}/games/fortune
.for f in ${DB} .for f in ${DB}
$f.dat: $f $f.dat: $f
PATH=$$PATH:/usr/bin:${.OBJDIR}/../strfile \ PATH=$$PATH:/usr/bin:${FORTUNE_OBJ}/strfile \
strfile -Cs ${.ALLSRC} ${.TARGET} strfile -Cs ${.ALLSRC} ${.TARGET}
.endfor .endfor

2
usr.bin/fortune/fortune/Makefile
View File

@ -3,7 +3,7 @@
PROG= fortune PROG= fortune
MAN= fortune.6 MAN= fortune.6
CFLAGS+=-DDEBUG -I${.CURDIR}/../strfile CFLAGS+=-DDEBUG -I${FORTUNE_SRC}/strfile
.include <bsd.prog.mk> .include <bsd.prog.mk>

2
usr.bin/fortune/unstr/Makefile
View File

@ -3,6 +3,6 @@
PROG= unstr PROG= unstr
MAN= MAN=
CFLAGS+= -I${.CURDIR}/../strfile CFLAGS+= -I${FORTUNE_SRC}/strfile
.include <bsd.prog.mk> .include <bsd.prog.mk>