mirror of
https://git.FreeBSD.org/src.git
synced 2024-11-28 08:02:54 +00:00
Don't include "${.CURDIR}/../../Makefile.inc" explicitly. Doing so was
a bogus no-op in the usual case where fortune/ is a subdir of games/ (since <bsd.prog.mk> does an equivalent include automatically if possible), but breaks building fortune when fortune/ is outside of the games/ tree (since the include was unconditional here). This fix depends on a previous fix for non-recursiveness of ../Makefile.inc (it didn't exist). PR: 25232
This commit is contained in:
parent
5be30b375e
commit
666fd63da7
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=72785
@ -1,4 +1,5 @@
|
||||
# @(#)Makefile 8.1 (Berkeley) 5/31/93
|
||||
# $FreeBSD$
|
||||
|
||||
PROG= fortune
|
||||
MAN6= fortune.6
|
||||
@ -6,5 +7,4 @@ CFLAGS+=-DDEBUG -Wall -I${.CURDIR}/../strfile
|
||||
DPADD= ${LIBCOMPAT}
|
||||
LDADD= -lcompat
|
||||
|
||||
.include "${.CURDIR}/../../Makefile.inc"
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -1,9 +1,9 @@
|
||||
# @(#)Makefile 8.1 (Berkeley) 5/31/93
|
||||
# $FreeBSD$
|
||||
|
||||
PROG= strfile
|
||||
MAN8= strfile.8
|
||||
MLINKS= strfile.8 unstr.8
|
||||
CFLAGS+= -Wall
|
||||
|
||||
.include "${.CURDIR}/../../Makefile.inc"
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -1,8 +1,8 @@
|
||||
# @(#)Makefile 8.1 (Berkeley) 5/31/93
|
||||
# $FreeBSD$
|
||||
|
||||
PROG= unstr
|
||||
NOMAN= noman
|
||||
CFLAGS+=-Wall -I${.CURDIR}/../strfile
|
||||
|
||||
.include "${.CURDIR}/../../Makefile.inc"
|
||||
.include <bsd.prog.mk>
|
||||
|
Loading…
Reference in New Issue
Block a user