diff options
| author | jlam <jlam@pkgsrc.org> | 2005-06-01 17:05:19 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2005-06-01 17:05:19 +0000 |
| commit | a72cd1c453fe743bb6f506dead7b434ac9cc77f4 (patch) | |
| tree | cad834d5c37ec21e14ca36e74299ee426139a47b /mk/bsd.makevars.mk | |
| parent | 926075cea79be15c57d41e8935982d078e69c771 (diff) | |
| download | pkgsrc-a72cd1c453fe743bb6f506dead7b434ac9cc77f4.tar.gz | |
Include bsd.makevars.mk in bsd.prefs.mk instead of bsd.pkg.mk. This
allows the saved make variables to be re-set whenever bsd.prefs.mk is
included, and is a shortcut for the common case where a Makefile
includes both.
Diffstat (limited to 'mk/bsd.makevars.mk')
| -rw-r--r-- | mk/bsd.makevars.mk | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/mk/bsd.makevars.mk b/mk/bsd.makevars.mk index 2fe63a99171..c0771252aa6 100644 --- a/mk/bsd.makevars.mk +++ b/mk/bsd.makevars.mk @@ -1,9 +1,10 @@ -# $NetBSD: bsd.makevars.mk,v 1.1 2005/06/01 03:04:16 jlam Exp $ +# $NetBSD: bsd.makevars.mk,v 1.2 2005/06/01 17:05:19 jlam Exp $ # -# This Makefile fragment is included by other Makefiles to set all of +# This Makefile fragment is included by bsd.prefs.mk to set all of # the variables saved through MAKEVARS. Typical usage is: # -# .include "../../mk/bsd.makevars.mk" +# .include "../../mk/bsd.prefs.mk" +# # .if !define(EXPENSIVE_VAR) # EXPENSIVE_VAR!= ( ... an expensive computation ... ) # .endif @@ -26,8 +27,10 @@ _REV_ALL_PHASES:= ${_phase_} ${_REV_ALL_PHASES} .endif MAKEVARS+= _REV_ALL_PHASES -# Try including the .makevars.mk.* files in reverse order so that the -# latest file is included and no more. +# Try including the *.makevars.mk files in reverse order so that the +# latest file is included and no more. We check for _MAKEVARS_MK since +# all of the *.makevars.mk files define this symbol at the top of the +# file. # .for _phase_ in ${_REV_ALL_PHASES} _MAKEVARS_MK.${_phase_}= ${WRKDIR}/.${_phase_}_makevars.mk |