diff options
author | apb <apb@NetBSD.org> | 2008-09-26 18:23:09 +0000 |
---|---|---|
committer | apb <apb@NetBSD.org> | 2008-09-26 18:23:09 +0000 |
commit | 08501e9d73781aee6bb3ae7a0c54f1b4ab36ffdf (patch) | |
tree | 75a153e70226b5bd9be8a47c82ad9cc73916f851 | |
parent | 2ebd9fd06a7f6efb7e24dab6b2433837514ad097 (diff) | |
download | bsdgames-darwin-08501e9d73781aee6bb3ae7a0c54f1b4ab36ffdf.tar.gz bsdgames-darwin-08501e9d73781aee6bb3ae7a0c54f1b4ab36ffdf.tar.zst bsdgames-darwin-08501e9d73781aee6bb3ae7a0c54f1b4ab36ffdf.zip |
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.
-rw-r--r-- | fortune/datfiles/Makefile | 5 | ||||
-rw-r--r-- | fortune/strfile/Makefile | 9 |
2 files changed, 7 insertions, 7 deletions
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> |