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/misc | |
| 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/misc')
| -rw-r--r-- | mk/misc/category.mk | 6 | ||||
| -rw-r--r-- | mk/misc/common.mk | 6 | ||||
| -rw-r--r-- | mk/misc/toplevel.mk | 6 |
3 files changed, 9 insertions, 9 deletions
diff --git a/mk/misc/category.mk b/mk/misc/category.mk index b0e3239b448..1a16a11083a 100644 --- a/mk/misc/category.mk +++ b/mk/misc/category.mk @@ -1,9 +1,9 @@ -# $NetBSD: category.mk,v 1.1 2007/08/13 08:12:51 rillig Exp $ +# $NetBSD: category.mk,v 1.2 2007/10/13 11:04:18 dsl Exp $ # # This file contains the variables and targets for category Makefiles. # -.include "${.PARSEDIR}/common.mk" +.include "common.mk" README.html: .PRECIOUS .PHONY @> $@.tmp @@ -42,4 +42,4 @@ README.html: .PRECIOUS .PHONY @cd ${subdir} && ${RECURSIVE_MAKE} ${MAKEFLAGS} "_THISDIR_=${_THISDIR_}${.CURDIR:T}/" ${_README_TYPE} .endfor -.include "${.PARSEDIR}/../bsd.pkg.subdir.mk" +.include "../bsd.pkg.subdir.mk" 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 diff --git a/mk/misc/toplevel.mk b/mk/misc/toplevel.mk index bfddf5968a3..ddb271b43f5 100644 --- a/mk/misc/toplevel.mk +++ b/mk/misc/toplevel.mk @@ -1,4 +1,4 @@ -# $NetBSD: toplevel.mk,v 1.3 2007/09/07 22:12:15 jlam Exp $ +# $NetBSD: toplevel.mk,v 1.4 2007/10/13 11:04:19 dsl Exp $ # # This file contains the make targets that can be used from the # top-level Makefile. They are in this separate file to keep the @@ -27,13 +27,13 @@ README.html: .PRECIOUS @${FALSE} .endif -.include "${.PARSEDIR}/../bsd.pkg.subdir.mk" +.include "../bsd.pkg.subdir.mk" # the bulk-cache and clean-bulk-cache targets are a global-pkgsrc # thing and thus it makes sense to run it from the top level pkgsrc # directory. .if make(bulk-cache) || make(clean-bulk-cache) -.include "${.PARSEDIR}/../bulk/bsd.bulk-pkg.mk" +.include "../bulk/bsd.bulk-pkg.mk" .endif .PHONY: ${.CURDIR}/PKGDB |