diff options
author | Bruce Evans <bde@FreeBSD.org> | 2001-02-21 06:12:38 +0000 |
---|---|---|
committer | Bruce Evans <bde@FreeBSD.org> | 2001-02-21 06:12:38 +0000 |
commit | 666fd63da7d1db26cdaa7adc523c84d8d64226f8 (patch) | |
tree | 59de8f9848a7268156cb29213a7a370a4b6ecae8 /games | |
parent | 5be30b375e66baa6a61e9ca9275dd8b433b3dbaa (diff) | |
download | src-666fd63da7d1db26cdaa7adc523c84d8d64226f8.tar.gz src-666fd63da7d1db26cdaa7adc523c84d8d64226f8.zip |
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
Notes
Notes:
svn path=/head/; revision=72785
Diffstat (limited to 'games')
-rw-r--r-- | games/fortune/fortune/Makefile | 2 | ||||
-rw-r--r-- | games/fortune/strfile/Makefile | 2 | ||||
-rw-r--r-- | 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 bb3258f92e9a..594f3ff89d65 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 <bsd.prog.mk> diff --git a/games/fortune/strfile/Makefile b/games/fortune/strfile/Makefile index 744e00004a1b..5a0cee3e7a7a 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 <bsd.prog.mk> diff --git a/games/fortune/unstr/Makefile b/games/fortune/unstr/Makefile index fa17ec64208c..c5469abea6fe 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 <bsd.prog.mk> |