diff options
| author | dsl <dsl@pkgsrc.org> | 2007-10-13 11:04:15 +0000 |
|---|---|---|
| committer | dsl <dsl@pkgsrc.org> | 2007-10-13 11:04:15 +0000 |
| commit | d24555b9566ee02d84ba1922350235b402515c7f (patch) | |
| tree | 63343dc34903d1fb65ed820cc0ce4a8a3a2ec0ce /mk/bsd.options.mk | |
| parent | d80f116517e16381340d12175c78b747eb6c2dec (diff) | |
| download | pkgsrc-d24555b9566ee02d84ba1922350235b402515c7f.tar.gz | |
Fix the .include lines so that make looks in the right place first.
Remember .include "foo.mk" is looked for (first) in the directory that
contains the makefile being processed (like in C), so remove all the
${.PARSEDIR} and ../ sequences that just cause grief.
Diffstat (limited to 'mk/bsd.options.mk')
| -rw-r--r-- | mk/bsd.options.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/bsd.options.mk b/mk/bsd.options.mk index 463b0a06626..1f8b88656b4 100644 --- a/mk/bsd.options.mk +++ b/mk/bsd.options.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.options.mk,v 1.63 2007/10/07 21:48:30 rillig Exp $ +# $NetBSD: bsd.options.mk,v 1.64 2007/10/13 11:04:16 dsl Exp $ # # This Makefile fragment provides boilerplate code for standard naming # conventions for handling per-package build options. @@ -157,7 +157,7 @@ _PKG_VARS.options= PKG_SUPPORTED_OPTIONS PKG_OPTIONS_VAR \ PKG_LEGACY_OPTIONS PKG_OPTIONS_DEPRECATED_WARNINGS _SYS_VARS.options= PKG_OPTIONS -.include "../../mk/bsd.prefs.mk" +.include "bsd.prefs.mk" # Define PKG_OPTIONS, no matter if we have an error or not, to suppress # further make(1) warnings. @@ -206,7 +206,7 @@ _PKG_OPTIONS_ALL_SETS+= ${_opt_} # # include deprecated variable to options mapping # -.include "${.PARSEDIR}/defaults/obsolete.mk" +.include "defaults/obsolete.mk" # # place options implied by legacy variables in PKG_LEGACY_OPTIONS |