hardenedbsd/HardenedBSD
1
0
Fork 0
mirror of https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git synced 2024-11-18 17:00:49 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

I found today that making packages for X11 ports wasn't working.

Browse Source 
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.
This commit is contained in:
Jordan K. Hubbard 1994-11-17 10:06:03 +00:00
parent c9a156d596
commit 07f6028ea8
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=4542
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
share/mk/bsd.port.mk
View File

@ -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"