Date: Mon, 30 Aug 1999 02:20:02 -0700 (PDT) From: Sheldon Hearn <sheldonh@uunet.co.za> To: freebsd-bugs@FreeBSD.org Subject: Re: misc/13398: Add WHICH_GAMES variable to src/Makefile.inc1 Message-ID: <199908300920.CAA86294@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
The following reply was made to PR misc/13398; it has been noted by GNATS.
From: Sheldon Hearn <sheldonh@uunet.co.za>
To: freebsd-gnats-submit@freebsd.org
Cc:
Subject: Re: misc/13398: Add WHICH_GAMES variable to src/Makefile.inc1
Date: Mon, 30 Aug 1999 11:11:14 +0200
I have a new proposed diff, including 3 changes from the original:
1) SOMEGAMES upset some people and I've been made to see that it isn't
necessary.
2) A local hack for cvs slipped into my diff.
3) I buggered the special-case handling for strfile and fortune.
I'll commit this in a few days if I don't get any more suggestions.
Ciao,
Sheldon.
Index: Makefile.inc1
===================================================================
RCS file: /home/ncvs/src/Makefile.inc1,v
retrieving revision 1.83
diff -u -d -r1.83 Makefile.inc1
--- Makefile.inc1 1999/08/30 08:33:15 1.83
+++ Makefile.inc1 1999/08/30 09:06:45
@@ -16,6 +16,7 @@
# -DNOLIBC_R do not build libc_r.
# -DNO_FORTRAN do not build g77 and related libraries.
# LOCAL_DIRS="list of dirs" to add additional dirs to the SUBDIR list
+# WHICH_GAMES="list of games" to build unless NOGAMES is defined.
#
# The intended user-driven targets are:
@@ -756,12 +757,22 @@
# Exclude unused tools from build-tools.
#
.if !defined(NOGAMES) && exists(${.CURDIR}/games)
+.if defined(WHICH_GAMES) && !empty(WHICH_GAMES:Madventure)
_adventure= games/adventure
+.endif
+.if defined(WHICH_GAMES) && !empty(WHICH_GAMES:Mcaesar)
_caesar= games/caesar
+.endif
+.if defined(WHICH_GAMES) && !empty(WHICH_GAMES:Mhack)
_hack= games/hack
+.endif
+.if defined(WHICH_GAMES) && !empty(WHICH_GAMES:Mphantasia)
_phantasia= games/phantasia
+.endif
+.if defined(WHICH_GAMES) && !empty(WHICH_GAMES:Mfortune)
_strfile= games/fortune/strfile
.endif
+.endif
.if !defined(NOPERL)
_perl= gnu/usr.bin/perl/miniperl
.endif
@@ -863,7 +874,12 @@
${MAKE} ${BTMAKEFLAGS} -B install ${CLEANDIR} ${OBJDIR}
.endfor
.if !defined(NOGAMES) && exists(${.CURDIR}/games)
- cd ${DESTDIR}/usr/games; cp -p caesar strfile ${DESTDIR}/usr/bin
+.if defined(WHICH_GAMES && !empty(WHICH_GAMES:Mcaesar)
+ cd ${DESTDIR}/usr/games && cp -p caesar ${DESTDIR}/usr/bin
+.endif
+.if defined(WHICH_GAMES && !empty(WHICH_GAMES:Mfortune)
+ cd ${DESTDIR}/usr/games && cp -p strfile ${DESTDIR}/usr/bin
+.endif
.endif
.for d in \
bin/sh \
Index: games/Makefile
===================================================================
RCS file: /home/ncvs/src/games/Makefile,v
retrieving revision 1.16
diff -u -d -r1.16 Makefile
--- Makefile 1999/08/27 23:28:45 1.16
+++ Makefile 1999/08/30 09:06:45
@@ -2,6 +2,9 @@
# $FreeBSD: src/games/Makefile,v 1.16 1999/08/27 23:28:45 peter Exp $
# XXX missing: chess ching monop [copyright]
+.if defined(WHICH_GAMES)
+SUBDIR= ${WHICH_GAMES}
+.else
SUBDIR= adventure \
arithmetic \
atc \
@@ -41,5 +44,6 @@
worm \
worms \
wump
+.endif
.include <bsd.subdir.mk>
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?199908300920.CAA86294>