Date: Mon, 8 Dec 2014 06:33:50 +0000 (UTC) From: Garrett Cooper <ngie@FreeBSD.org> To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275596 - in projects/building-blocks: . usr.bin/vi Message-ID: <201412080633.sB86XorQ010822@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: ngie Date: Mon Dec 8 06:33:49 2014 New Revision: 275596 URL: https://svnweb.freebsd.org/changeset/base/275596 Log: Push the build-tools logic down into Makefile.inc1 so it's localized all in one spot, and the potential for installing to the wrong DESTDIR is lower Modified: projects/building-blocks/Makefile.inc1 projects/building-blocks/usr.bin/vi/Makefile Modified: projects/building-blocks/Makefile.inc1 ============================================================================== --- projects/building-blocks/Makefile.inc1 Mon Dec 8 06:10:47 2014 (r275595) +++ projects/building-blocks/Makefile.inc1 Mon Dec 8 06:33:49 2014 (r275596) @@ -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} Modified: projects/building-blocks/usr.bin/vi/Makefile ============================================================================== --- projects/building-blocks/usr.bin/vi/Makefile Mon Dec 8 06:10:47 2014 (r275595) +++ projects/building-blocks/usr.bin/vi/Makefile Mon Dec 8 06:33:49 2014 (r275596) @@ -73,9 +73,4 @@ SRCS+= vs_line.c vs_msg.c vs_refresh.c v # 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>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412080633.sB86XorQ010822>