From 666fd63da7d1db26cdaa7adc523c84d8d64226f8 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Wed, 21 Feb 2001 06:12:38 +0000 Subject: [PATCH] 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 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 --- games/fortune/fortune/Makefile | 2 +- games/fortune/strfile/Makefile | 2 +- games/fortune/unstr/Makefile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/games/fortune/fortune/Makefile b/games/fortune/fortune/Makefile index bb3258f92e9..594f3ff89d6 100644 --- a/games/fortune/fortune/Makefile +++ b/games/fortune/fortune/Makefile @@ -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 diff --git a/games/fortune/strfile/Makefile b/games/fortune/strfile/Makefile index 744e00004a1..5a0cee3e7a7 100644 --- a/games/fortune/strfile/Makefile +++ b/games/fortune/strfile/Makefile @@ -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 diff --git a/games/fortune/unstr/Makefile b/games/fortune/unstr/Makefile index fa17ec64208..c5469abea6f 100644 --- a/games/fortune/unstr/Makefile +++ b/games/fortune/unstr/Makefile @@ -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