d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Push the build-tools logic down into Makefile.inc1 so it's localized all in

Browse Source 
one spot, and the potential for installing to the wrong DESTDIR is lower
This commit is contained in:
Enji Cooper 2014-12-08 06:33:49 +00:00
parent 2c3f939cab
commit 1955a4bf0e
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Makefile.inc1
View File

@ -1390,11 +1390,12 @@ build-tools: .MAKE
.endfor
.for _tool in \
usr.bin/vi
${_+_}@${ECHODIR} "===> ${_tool} (obj,build-tools,install)"; \
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all,install)"; \
cd ${.CURDIR}/${_tool} && \
${MAKE} DIRPRFX=${_tool}/ obj && \
${MAKE} DIRPRFX=${_tool}/ build-tools DESTDIR=${WORLDTMP}/ \
MK_MAN=no
${MAKE} DIRPRFX=${_tool}/ depend MK_MAN=no SUBDIR= && \
${MAKE} DIRPRFX=${_tool}/ all MK_MAN=no SUBDIR= && \
${MAKE} DIRPRFX=${_tool}/ install MK_MAN=no SUBDIR= DESTDIR=${WORLDTMP}/
.endfor
#
@ -2011,6 +2012,7 @@ XDEV_CPUTYPE?=${TARGET_CPUTYPE}
NOFUN=-DNO_FSCHG MK_HTML=no MK_INFO=no -DNO_LINT \
MK_MAN=no MK_NLS=no MK_PROFILE=no \
MK_KERBEROS=no MK_RESCUE=no MK_TESTS=no MK_WARNS=no \
MK_VI=no \
TARGET=${TARGET} TARGET_ARCH=${TARGET_ARCH} \
CPUTYPE=${XDEV_CPUTYPE}

5
usr.bin/vi/Makefile
View File

@ -73,9 +73,4 @@ SRCS+= vs_line.c vs_msg.c vs_refresh.c vs_relative.c vs_smap.c vs_split.c
# Wide char regex
SRCS+= regcomp.c regerror.c regexec.c regfree.c
build-tools:
.for t in obj depend all install
cd ${.CURDIR} && ${MAKE} $t SUBDIR=
.endfor
.include <bsd.prog.mk>