Add a variable LOCAL_PREFIX that defaults to "/usr/local", as a
counterpart to X11BASE (default "/usr/X11R6"). Now PREFIX is set to ${X11BASE} or ${LOCAL_PREFIX} depending on whether USE_IMAKE or USE_X11 is set or not. This enables us to refer to non-X ports from X ports using ${LOCAL_PREFIX}, thus removing most of the remaining "/usr/local"s from the ports tree. This will also allow the system administrator to move the whole "local" tree to somewhere else, without affecting X ports. (Of course not all ports are necessarily happy with that, but we're working on it.) Based on: an idea that came up while I was watching a football game several months ago ("hey, maybe I can move that sideline without disturbing the other!")
This commit is contained in:
parent
7ffaf3cfb7
commit
a3e1409aae
@ -3,7 +3,7 @@
|
||||
# bsd.port.mk - 940820 Jordan K. Hubbard.
|
||||
# This file is in the public domain.
|
||||
#
|
||||
# $Id: bsd.port.mk,v 1.195 1996/03/06 08:14:26 asami Exp $
|
||||
# $Id: bsd.port.mk,v 1.196 1996/03/10 08:26:21 asami Exp $
|
||||
#
|
||||
# Please view me with 4 column tabs!
|
||||
|
||||
@ -194,6 +194,7 @@
|
||||
# tree we are and thus can't go relative. They can, of course, be overridden
|
||||
# by individual Makefiles.
|
||||
PORTSDIR?= ${DESTDIR}/usr/ports
|
||||
LOCAL_PREFIX?= /usr/local
|
||||
X11BASE?= /usr/X11R6
|
||||
DISTDIR?= ${PORTSDIR}/distfiles/${DIST_SUBDIR}
|
||||
PACKAGES?= ${PORTSDIR}/packages
|
||||
@ -214,7 +215,7 @@ PKGDIR?= ${.CURDIR}/pkg
|
||||
.if defined(USE_IMAKE) || defined(USE_X11)
|
||||
PREFIX?= ${X11BASE}
|
||||
.else
|
||||
PREFIX?= /usr/local
|
||||
PREFIX?= ${LOCAL_PREFIX}
|
||||
.endif
|
||||
# The following 4 lines should go away as soon as the ports are all updated
|
||||
.if defined(EXEC_DEPENDS)
|
||||
|
Loading…
Reference in New Issue
Block a user