From owner-freebsd-bugs  Tue Feb 20  8:50:18 2001
Delivered-To: freebsd-bugs@hub.freebsd.org
Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 8900337B65D
	for <freebsd-bugs@hub.freebsd.org>; Tue, 20 Feb 2001 08:50:04 -0800 (PST)
	(envelope-from gnats@FreeBSD.org)
Received: (from gnats@localhost)
	by freefall.freebsd.org (8.11.1/8.11.1) id f1KGo4X61285;
	Tue, 20 Feb 2001 08:50:04 -0800 (PST)
	(envelope-from gnats)
Received: from mta06-svc.ntlworld.com (mta06-svc.ntlworld.com [62.253.162.46])
	by hub.freebsd.org (Postfix) with ESMTP id 7DAE037B4EC
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 20 Feb 2001 08:47:08 -0800 (PST)
	(envelope-from greid@ukug.uk.freebsd.org)
Received: from m171-mp1-cvx1b.gui.ntl.com ([62.252.8.171])
          by mta06-svc.ntlworld.com
          (InterMail vM.4.01.02.27 201-229-119-110) with ESMTP
          id <20010220164704.HCBC285.mta06-svc.ntlworld.com@m171-mp1-cvx1b.gui.ntl.com>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Tue, 20 Feb 2001 16:47:04 +0000
Message-Id: <Pine.BSF.4.21.0102201641080.8657-100000@sobek.openirc.co.uk>
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
Sender: owner-freebsd-bugs@FreeBSD.ORG
Precedence: bulk
X-Loop: FreeBSD.org


>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