From 2a6c45c9aa5a5c8c0aeb794cf23b707d191d96f8 Mon Sep 17 00:00:00 2001 From: Bruce Evans Date: Sat, 17 Oct 1998 11:56:20 +0000 Subject: [PATCH] Don't add /usr/games to $PATH. Adding it here can only work for the `make world' case, and only made a difference for the evil NOTOOLS case of `make world' since games tools are installed in ${TOOLROOT}/usr/bin if they are built, but the PR was for normal builds. This is fixed in rev.1.14 of src/games/fortune/datfiles/Makefile. PR: 7936 --- Makefile.inc1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile.inc1 b/Makefile.inc1 index 084d312d2ecc..9c2b24a09dfd 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,5 +1,5 @@ # -# $Id: Makefile.inc1,v 1.34 1998/10/13 10:01:32 rnordier Exp $ +# $Id: Makefile.inc1,v 1.35 1998/10/16 14:22:54 bde Exp $ # # Make command line options: # -DCLOBBER will remove /usr/include @@ -170,12 +170,12 @@ WORLDTMP= /usr/obj${.CURDIR}/tmp # Default root of the tool tree TOOLROOT?= # Choose the PATH relative to the root of the tool tree -PATH= ${TOOLROOT}/sbin:${TOOLROOT}/bin:${TOOLROOT}/usr/sbin:${TOOLROOT}/usr/bin:${TOOLROOT}/usr/games +PATH= ${TOOLROOT}/sbin:${TOOLROOT}/bin:${TOOLROOT}/usr/sbin:${TOOLROOT}/usr/bin .else TOOLROOT= ${WORLDTMP} .endif -STRICTTMPPATH= ${TOOLROOT}/sbin:${TOOLROOT}/usr/sbin:${TOOLROOT}/bin:${TOOLROOT}/usr/bin:${TOOLROOT}/usr/games -TMPPATH= ${STRICTTMPPATH}:${PATH}:/usr/games +STRICTTMPPATH= ${TOOLROOT}/sbin:${TOOLROOT}/usr/sbin:${TOOLROOT}/bin:${TOOLROOT}/usr/bin +TMPPATH= ${STRICTTMPPATH}:${PATH} # XXX COMPILER_PATH is needed for finding cc1, ld and as # XXX GCC_EXEC_PREFIX is for *crt.o. It is probably unnecessary now