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
This commit is contained in:
parent
353f3cf0a6
commit
2a6c45c9aa
@ -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:
|
# Make command line options:
|
||||||
# -DCLOBBER will remove /usr/include
|
# -DCLOBBER will remove /usr/include
|
||||||
@ -170,12 +170,12 @@ WORLDTMP= /usr/obj${.CURDIR}/tmp
|
|||||||
# Default root of the tool tree
|
# Default root of the tool tree
|
||||||
TOOLROOT?=
|
TOOLROOT?=
|
||||||
# Choose the PATH relative to the root of the tool tree
|
# 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
|
.else
|
||||||
TOOLROOT= ${WORLDTMP}
|
TOOLROOT= ${WORLDTMP}
|
||||||
.endif
|
.endif
|
||||||
STRICTTMPPATH= ${TOOLROOT}/sbin:${TOOLROOT}/usr/sbin:${TOOLROOT}/bin:${TOOLROOT}/usr/bin:${TOOLROOT}/usr/games
|
STRICTTMPPATH= ${TOOLROOT}/sbin:${TOOLROOT}/usr/sbin:${TOOLROOT}/bin:${TOOLROOT}/usr/bin
|
||||||
TMPPATH= ${STRICTTMPPATH}:${PATH}:/usr/games
|
TMPPATH= ${STRICTTMPPATH}:${PATH}
|
||||||
|
|
||||||
# XXX COMPILER_PATH is needed for finding cc1, ld and as
|
# XXX COMPILER_PATH is needed for finding cc1, ld and as
|
||||||
# XXX GCC_EXEC_PREFIX is for *crt.o. It is probably unnecessary now
|
# XXX GCC_EXEC_PREFIX is for *crt.o. It is probably unnecessary now
|
||||||
|
Loading…
Reference in New Issue
Block a user