From owner-svn-src-projects@FreeBSD.ORG Mon Dec 8 06:33:50 2014 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id DAFE8258; Mon, 8 Dec 2014 06:33:50 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id ADBBFE4E; Mon, 8 Dec 2014 06:33:50 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sB86XopW010824; Mon, 8 Dec 2014 06:33:50 GMT (envelope-from ngie@FreeBSD.org) Received: (from ngie@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sB86XorQ010822; Mon, 8 Dec 2014 06:33:50 GMT (envelope-from ngie@FreeBSD.org) Message-Id: <201412080633.sB86XorQ010822@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: ngie set sender to ngie@FreeBSD.org using -f From: Garrett Cooper Date: Mon, 8 Dec 2014 06:33:50 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r275596 - in projects/building-blocks: . usr.bin/vi X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 08 Dec 2014 06:33:51 -0000 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