From 2247167092bd2ba8df69e865f83c0e43fafb3a88 Mon Sep 17 00:00:00 2001 From: jlam Date: Tue, 6 Jun 2006 06:30:29 +0000 Subject: Separate out the part of bsd.tools.mk that actually created the tools into a new file pkgsrc/mk/tools/create.mk. This leaves bsd.tools.mk as a file that pulls in all of the other ones. Also move the tools-related targets from bsd.pkg.mk into bsd.tools.mk. The tools cookie file has been removed, as well as hooks for {pre,do,post}-tools. Instead, there is now only a single public target "tools" which may be invoked. Invoking "tools" will always cause all of the tools in ${TOOLS_DIR} to be created. The "tools" step has been moved and is now just after the "depends" step and before sources are extracted. This is the earliest place where the "tools" step can be taken, and it allows the created tools to be used in all steps/phases after it, starting with "extract". As a consequence, we should just invoke tools by their bare names in targets, e.g. awk, sed, patch, etc., instead of with the ${VARIABLE} names, e.g. ${AWK}, ${SED}, ${PATCH}, etc. --- mk/extract/extract.mk | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'mk/extract') diff --git a/mk/extract/extract.mk b/mk/extract/extract.mk index f4c7aac4947..2b78e4b9aaa 100644 --- a/mk/extract/extract.mk +++ b/mk/extract/extract.mk @@ -1,4 +1,4 @@ -# $NetBSD: extract.mk,v 1.1 2006/06/06 03:05:48 jlam Exp $ +# $NetBSD: extract.mk,v 1.2 2006/06/06 06:30:29 jlam Exp $ # # The following variables may be set by the package Makefile and # specify how extraction happens: @@ -45,6 +45,7 @@ _EXTRACT_COOKIE= ${WRKDIR}/.extract_done _EXTRACT_TARGETS+= checksum _EXTRACT_TARGETS+= ${WRKDIR} _EXTRACT_TARGETS+= depends +_EXTRACT_TARGETS+= tools _EXTRACT_TARGETS+= acquire-extract-lock _EXTRACT_TARGETS+= ${_EXTRACT_COOKIE} _EXTRACT_TARGETS+= release-extract-lock -- cgit v1.2.3