cpet
/
openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

provide a _MAKE internal that does the cd ${.CURDIR} && exec, 

use it to avoid the obj/ problem in /usr/ports.
provide a _MAKESYS internal for bsd.port.mk with SYSTRACE too
This commit is contained in:
espie 2010-04-20 10:03:36 +00:00
parent 5b287b6cbf
commit 8565ca1737
2 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.62 2009/10/12 10:25:40 espie Exp $
# $OpenBSD: Makefile,v 1.63 2010/04/20 10:03:36 espie Exp $
# $FreeBSD: Makefile,v 1.36 1997/10/04 15:54:31 jkh Exp $
#
@ -77,11 +77,11 @@ SUBDIR += x11
index:
@rm -f ${.CURDIR}/INDEX
@${MAKE} ${.CURDIR}/INDEX
@${_MAKE} ${.CURDIR}/INDEX
${.CURDIR}/INDEX:
@echo "Generating INDEX..."
@${MAKE} describe MACHINE_ARCH=i386 ECHO_MSG="echo 1>&2" > ${.CURDIR}/INDEX
@${_MAKE} describe MACHINE_ARCH=i386 ECHO_MSG="echo 1>&2" > ${.CURDIR}/INDEX
@echo "Done."
print-index: ${.CURDIR}/INDEX
@ -126,13 +126,13 @@ mirror-maker:
@_DONE_FILES=`mktemp /tmp/depends.XXXXXXXXX|| exit 1`; \
export _DONE_FILES; \
trap "rm -f $${_DONE_FILES}" 0 1 2 3 13 15; \
${MAKE} fetch-makefile \
${_MAKE} fetch-makefile \
ECHO_MSG='echo >&2' \
_FETCH_MAKEFILE=${MIRROR_MK}
homepages.html:
@echo '<html><ul>' >$@
@${MAKE} homepage-links ECHO_MSG='echo >&2' >>$@
@${_MAKE} homepage-links ECHO_MSG='echo >&2' >>$@
@echo '</ul></html>' >>$@
distfiles-update-locatedb:

4
infrastructure/mk/pkgpath.mk
View File

@ -1,4 +1,4 @@
# $OpenBSD: pkgpath.mk,v 1.24 2010/04/05 13:59:03 espie Exp $
# $OpenBSD: pkgpath.mk,v 1.25 2010/04/20 10:03:36 espie Exp $
# ex:ts=4 sw=4 filetype=make:
# pkgpath.mk - 2003 Marc Espie
# This file is in the public domain.
@ -89,6 +89,8 @@ _depfile_fragment = \
HTMLIFY = sed -e 's/&/\&amp;/g' -e 's/>/\&gt;/g' -e 's/</\&lt;/g'
_MAKE = cd ${.CURDIR} && exec ${MAKE}
_MAKESYS = cd ${.CURDIR} && exec ${_SYSTRACE_CMD} ${MAKE}
REPORT_PROBLEM_LOGFILE ?=
.if !empty(REPORT_PROBLEM_LOGFILE)