summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbde <bde@FreeBSD.org>2001-02-21 06:12:38 +0000
committerbde <bde@FreeBSD.org>2001-02-21 06:12:38 +0000
commit17bdecb1829f632354d48f743f10ff707edded9c (patch)
tree22a86c2b55dc97545b460575eb548182a03ce113
parentb8eb67e3be408d1544cd7afa8a0854e7ffefa96e (diff)
downloadFreeBSD-src-17bdecb1829f632354d48f743f10ff707edded9c.zip
FreeBSD-src-17bdecb1829f632354d48f743f10ff707edded9c.tar.gz
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
-rw-r--r--games/fortune/fortune/Makefile2
-rw-r--r--games/fortune/strfile/Makefile2
-rw-r--r--games/fortune/unstr/Makefile2
3 files changed, 3 insertions, 3 deletions
diff --git a/games/fortune/fortune/Makefile b/games/fortune/fortune/Makefile
index bb3258f..594f3ff 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 744e000..5a0cee3 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 fa17ec6..c5469ab 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>
OpenPOWER on IntegriCloud