Date: Tue, 20 Feb 2001 16:55:57 +0000 (GMT) From: George Reid <greid@dogma.freebsd-uk.eu.org> To: FreeBSD-gnats-submit@freebsd.org Subject: bin/25232: [PATCH] fix fortune out-of-tree build Message-ID: <Pine.BSF.4.21.0102201641080.8657-100000@sobek.openirc.co.uk>
next in thread | raw e-mail | index | archive | help
>Number: 25232
>Category: bin
>Synopsis: [PATCH] fix fortune out-of-tree build
>Confidential: no
>Severity: non-critical
>Priority: low
>Responsible: freebsd-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: sw-bug
>Submitter-Id: current-users
>Arrival-Date: Tue Feb 20 08:50:04 PST 2001
>Closed-Date:
>Last-Modified:
>Originator: George Reid
>Release: FreeBSD 5.0-CURRENT i386
>Organization:
FreeBSD UK Usergroup
>Environment:
FreeBSD 5.0-CURRENT i386
>Description:
games/fortune out-of-tree build is broken.
make tries to include ${CURDIR}../../Makefile.inc which exists in
src/games in-tree. This prevents the program from compiling out-of-tree.
There is a Makefile.inc in fortune/ which includes src/games/Makefile.inc
if it exists (i.e. if doing an in-tree build).
>How-To-Repeat:
cd /tmp; cvs co -r HEAD fortune; cd fortune; make
>Fix:
Index: fortune/Makefile
===================================================================
RCS file: /usr/home/ncvs/src/games/fortune/fortune/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- fortune/Makefile 1996/09/05 17:13:50 1.3
+++ fortune/Makefile 2001/02/20 16:54:08
@@ -6,5 +6,5 @@
DPADD= ${LIBCOMPAT}
LDADD= -lcompat
-.include "${.CURDIR}/../../Makefile.inc"
+.include "${.CURDIR}/../Makefile.inc"
.include <bsd.prog.mk>
Index: strfile/Makefile
===================================================================
RCS file: /usr/home/ncvs/src/games/fortune/strfile/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- strfile/Makefile 1996/05/27 22:43:35 1.2
+++ strfile/Makefile 2001/02/20 16:54:14
@@ -5,5 +5,5 @@
MLINKS= strfile.8 unstr.8
CFLAGS+= -Wall
-.include "${.CURDIR}/../../Makefile.inc"
+.include "${.CURDIR}/../Makefile.inc"
.include <bsd.prog.mk>
Index: unstr/Makefile
===================================================================
RCS file: /usr/home/ncvs/src/games/fortune/unstr/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- unstr/Makefile 1996/05/27 22:43:41 1.2
+++ unstr/Makefile 2001/02/20 16:54:20
@@ -4,5 +4,5 @@
NOMAN= noman
CFLAGS+=-Wall -I${.CURDIR}/../strfile
-.include "${.CURDIR}/../../Makefile.inc"
+.include "${.CURDIR}/../Makefile.inc"
.include <bsd.prog.mk>
>Release-Note:
>Audit-Trail:
>Unformatted:
To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-bugs" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?Pine.BSF.4.21.0102201641080.8657-100000>