diff options
| author | jlam <jlam@pkgsrc.org> | 2006-06-06 06:30:29 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2006-06-06 06:30:29 +0000 |
| commit | cd1230e8e371554e309755e0e2d06433c1464941 (patch) | |
| tree | 9920fd5c6fa218862616c8c8f878cd84172f09bb /mk/bsd.prefs.mk | |
| parent | e3e58f764bb8893ee08bf872b5f8a89e3812e102 (diff) | |
| download | pkgsrc-cd1230e8e371554e309755e0e2d06433c1464941.tar.gz | |
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.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 8758b29da75..c6c509fbb62 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.224 2006/06/06 04:48:19 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.225 2006/06/06 06:30:29 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -343,10 +343,10 @@ PKG_PHASE?= none # equal to" <phase>. # ALL_PHASES= ${PHASES_AFTER_FETCH} -PHASES_AFTER_FETCH= fetch ${PHASES_AFTER_EXTRACT} +PHASES_AFTER_FETCH= fetch ${PHASES_AFTER_TOOLS} +PHASES_AFTER_TOOLS= tools ${PHASES_AFTER_EXTRACT} PHASES_AFTER_EXTRACT= extract ${PHASES_AFTER_PATCH} -PHASES_AFTER_PATCH= patch ${PHASES_AFTER_TOOLS} -PHASES_AFTER_TOOLS= tools ${PHASES_AFTER_WRAPPER} +PHASES_AFTER_PATCH= patch ${PHASES_AFTER_WRAPPER} PHASES_AFTER_WRAPPER= wrapper ${PHASES_AFTER_CONFIGURE} PHASES_AFTER_CONFIGURE= configure ${PHASES_AFTER_BUILD} PHASES_AFTER_BUILD= build ${PHASES_AFTER_INSTALL} |