From: apb <apb@NetBSD.org>
Date: Fri, 26 Sep 2008 18:23:09 +0000 (+0000)
Subject: Build strfile both as a host tool and as an installed program:
X-Git-Url: https://git.cameronkatri.com/bsdgames-darwin.git/commitdiff_plain/08501e9d73781aee6bb3ae7a0c54f1b4ab36ffdf

Build strfile both as a host tool and as an installed program:
* in games/fortune/strfile/Makefile, build strfile as a
  regular program instead of as a host tool;
* add tools/strfile directory to build strfile as a host tool;
* in tools/Makefile, add strfile to SUBDIR list;
* in BSD.*.mk, define TOOL_STRFILE variable;
* in games/fortune/datfiles/Makefile, use TOOL_STRFILE when creating
  databases at build time;
* in distrib/sets/lists/games/mi, mention usr/games/strfile.
---

diff --git a/fortune/datfiles/Makefile b/fortune/datfiles/Makefile
index d9b44a35..10b07db8 100644
--- a/fortune/datfiles/Makefile
+++ b/fortune/datfiles/Makefile
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.37 2008/03/21 21:09:48 reed Exp $
+#	$NetBSD: Makefile,v 1.38 2008/09/26 18:23:09 apb Exp $
 #	@(#)Makefile	8.2 (Berkeley) 4/19/94
 
 .include <bsd.own.mk>			# for INSTALL_OFFENSIVE_FORTUNES
@@ -24,8 +24,7 @@ TYPE=		fake
 
 CLEANFILES+=${DATFILES}
 
-STRFILEDIR!=cd $(.CURDIR)/../strfile; ${PRINTOBJDIR}
-STRFILE=${STRFILEDIR}/strfile
+STRFILE=${TOOL_STRFILE}
 
 .if ${MKSHARE} != "no"
 FILES=${SRCFILES} ${DATFILES}
diff --git a/fortune/strfile/Makefile b/fortune/strfile/Makefile
index a56d1d4c..669e3549 100644
--- a/fortune/strfile/Makefile
+++ b/fortune/strfile/Makefile
@@ -1,7 +1,8 @@
-#	$NetBSD: Makefile,v 1.8 2000/04/14 04:12:19 simonb Exp $
+#	$NetBSD: Makefile,v 1.9 2008/09/26 18:23:09 apb Exp $
 #	@(#)Makefile	8.1 (Berkeley) 5/31/93
 
-HOSTPROG=	strfile
-MAN=		strfile.8
+PROG=	strfile
+MAN=	strfile.8
 
-.include <bsd.hostprog.mk>
+.include "../../Makefile.inc"
+.include <bsd.prog.mk>