diff options
| author | tv <tv@pkgsrc.org> | 2005-01-27 04:05:08 +0000 |
|---|---|---|
| committer | tv <tv@pkgsrc.org> | 2005-01-27 04:05:08 +0000 |
| commit | bcce274c8b8b1c04c6103f8d53ef63a408d6d55b (patch) | |
| tree | ddd6cf8f774ad38c1747ec448f921a16b642ed57 /mk/bsd.prefs.mk | |
| parent | 8ee5c315f0e33d58aac9a624403213f07d8ef888 (diff) | |
| download | pkgsrc-bcce274c8b8b1c04c6103f8d53ef63a408d6d55b.tar.gz | |
Move the PREPEND_PATH for LOCALBASE/bin (and optionally X11BASE/bin) to a
spot that will come before compiler.mk (in bsd.prefs.mk). Previously,
LOCALBASE/bin was appearing earlier in the path than work/.<compiler>/bin,
which could cause the Wrong Thing to happen.
Diffstat (limited to 'mk/bsd.prefs.mk')
| -rw-r--r-- | mk/bsd.prefs.mk | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 783490fd325..c283dc1e57a 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.177 2004/11/20 04:37:08 grant Exp $ +# $NetBSD: bsd.prefs.mk,v 1.178 2005/01/27 04:05:08 tv Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -536,6 +536,9 @@ WRKLOG?= ${WRKDIR}/.work.log PKG_DEFAULT_OPTIONS?= # empty PKG_OPTIONS?= # empty +# we want this *before* compiler.mk, so that compiler.mk paths override them +PREPEND_PATH+= ${LOCALBASE}/bin ${USE_IMAKE:D${X11BASE}/bin} + # Wrapper framework definitions .if exists(${PKGSRCDIR}/mk/wrapper/wrapper-defs.mk) . include "${PKGSRCDIR}/mk/wrapper/wrapper-defs.mk" |