diff options
| author | jkh <jkh@FreeBSD.org> | 1994-11-17 18:06:03 +0800 |
|---|---|---|
| committer | jkh <jkh@FreeBSD.org> | 1994-11-17 18:06:03 +0800 |
| commit | b8fed46b62b0970281bfd59f3c0bca4967fadbcb (patch) | |
| tree | b28889485d18de088837feb346ad83bc68d42c91 /Mk | |
| parent | a4bb25aa8e788ddb7fab06c4474a9a46d35ac14a (diff) | |
| download | freebsd-ports-gnome-b8fed46b62b0970281bfd59f3c0bca4967fadbcb.tar.gz freebsd-ports-gnome-b8fed46b62b0970281bfd59f3c0bca4967fadbcb.tar.zst freebsd-ports-gnome-b8fed46b62b0970281bfd59f3c0bca4967fadbcb.zip | |
I found today that making packages for X11 ports wasn't working.
Further investigation showed that prefix was erroneously set to /usr/local
for X11 based ports as well, when the assumption was that they'd really go
into ${X11BASE} (an /etc/make.conf variable that the user's free to set).
Set X11BASE to /usr/X11R6 if the user hasn't already, and assume that
the user really wants prefix to point there when the port is XMKMF based.
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.port.mk | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk index cea2a85d1eae..8d70032e23c3 100644 --- a/Mk/bsd.port.mk +++ b/Mk/bsd.port.mk @@ -3,7 +3,7 @@ # bsd.port.mk - 940820 Jordan K. Hubbard. # This file is in the public domain. # -# $Id: bsd.port.mk,v 1.68 1994/11/17 00:18:28 jkh Exp $ +# $Id: bsd.port.mk,v 1.69 1994/11/17 00:25:16 jkh Exp $ # # Please view me with 4 column tabs! @@ -96,7 +96,7 @@ # tree we are and thus can't go relative. They can, of course, be overridden # by individual Makefiles. PORTSDIR?= ${DESTDIR}/usr/ports -PREFIX?= /usr/local +X11BASE?= /usr/X11R6 DISTDIR?= ${PORTSDIR}/distfiles PACKAGES?= ${PORTSDIR}/packages .if !defined(NO_WRKDIR) @@ -113,6 +113,11 @@ PATCHDIR?= ${.CURDIR}/patches SCRIPTDIR?= ${.CURDIR}/scripts FILESDIR?= ${.CURDIR}/files PKGDIR?= ${.CURDIR}/pkg +.if defined(USE_XMKMF) +PREFIX?= ${X11BASE} +.else +PREFIX?= /usr/local +.endif .if exists(${PORTSDIR}/../Makefile.inc) .include "${PORTSDIR}/../Makefile.inc" |