diff options
| author | dsl <dsl> | 2007-10-13 11:04:15 +0000 |
|---|---|---|
| committer | dsl <dsl> | 2007-10-13 11:04:15 +0000 |
| commit | 4e45644385db572a7d11a4a136d73c689f435d0d (patch) | |
| tree | 63343dc34903d1fb65ed820cc0ce4a8a3a2ec0ce /mk/misc/common.mk | |
| parent | eebe8bf3b70238a708e826def91ee8fc98551dc8 (diff) | |
| download | pkgsrc-4e45644385db572a7d11a4a136d73c689f435d0d.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/misc/common.mk')
| -rw-r--r-- | mk/misc/common.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mk/misc/common.mk b/mk/misc/common.mk index 5fbe60de22c..10f1321ca86 100644 --- a/mk/misc/common.mk +++ b/mk/misc/common.mk @@ -1,4 +1,4 @@ -# $NetBSD: common.mk,v 1.2 2007/08/13 08:45:17 rillig Exp $ +# $NetBSD: common.mk,v 1.3 2007/10/13 11:04:19 dsl Exp $ # # This file contains the definitions that are used in all directories of # pkgsrc -- the top-level, the categories and the packages themselves. @@ -25,7 +25,7 @@ PKG_FAIL_REASON+= "[bsd.pkg.mk] Run \"${MAKE} help topic=make_jobs\" to get some .endif # Include any preferences, if not already included, and common definitions -.include "${.PARSEDIR}/../bsd.prefs.mk" +.include "../bsd.prefs.mk" PKG_DEBUG_LEVEL?= 0 _PKG_SILENT= @ @@ -44,5 +44,5 @@ _PKG_DEBUG_SCRIPT= ${SH} -x RUN= ${_PKG_SILENT}${_PKG_DEBUG} set -e; .if make(help) -.include "${.PARSEDIR}/../help/help.mk" +.include "../help/help.mk" .endif |