[pkgsrc/trunk]: pkgsrc/mk Fix the .include lines so that make looks in the ri...

[dsl <dsl%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8ecbf10e9690
branches:  trunk
changeset: 534168:8ecbf10e9690
user:      dsl <dsl%pkgsrc.org@localhost>
date:      Sat Oct 13 11:04:15 2007 +0000

description:
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:

 mk/apachever.mk         |    4 +-
 mk/bsd.options.mk       |    6 +-
 mk/bsd.pkg.mk           |  102 ++++++++++++++++++++++++------------------------
 mk/bsd.pkg.subdir.mk    |    4 +-
 mk/check/bsd.check.mk   |   18 ++++----
 mk/emulator/darwin.mk   |    4 +-
 mk/emulator/emulator.mk |    6 +-
 mk/emulator/freebsd.mk  |    4 +-
 mk/emulator/irix.mk     |    4 +-
 mk/emulator/linux.mk    |    4 +-
 mk/emulator/netbsd.mk   |    4 +-
 mk/emulator/osf1.mk     |    4 +-
 mk/emulator/solaris.mk  |    4 +-
 mk/emulator/sunos.mk    |    4 +-
 mk/misc/category.mk     |    6 +-
 mk/misc/common.mk       |    6 +-
 mk/misc/toplevel.mk     |    6 +-
 mk/pam.buildlink3.mk    |    4 +-
 mk/pkg-build-options.mk |    4 +-
 19 files changed, 99 insertions(+), 99 deletions(-)

diffs (truncated from 577 to 300 lines):

diff -r 0da091af67f3 -r 8ecbf10e9690 mk/apachever.mk
--- a/mk/apachever.mk   Sat Oct 13 10:52:30 2007 +0000
+++ b/mk/apachever.mk   Sat Oct 13 11:04:15 2007 +0000
@@ -1,5 +1,5 @@
-# $NetBSD: apachever.mk,v 1.3 2007/09/29 15:58:16 rillig Exp $
+# $NetBSD: apachever.mk,v 1.4 2007/10/13 11:04:15 dsl Exp $
 #
 # This file is obsolete. It will be removed after branching 2007Q4.
 #
-.include "${.PARSEDIR}/apache.mk"
+.include "apache.mk"
diff -r 0da091af67f3 -r 8ecbf10e9690 mk/bsd.options.mk
--- a/mk/bsd.options.mk Sat Oct 13 10:52:30 2007 +0000
+++ b/mk/bsd.options.mk Sat Oct 13 11:04:15 2007 +0000
@@ -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_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 @@
 #
 # 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
diff -r 0da091af67f3 -r 8ecbf10e9690 mk/bsd.pkg.mk
--- a/mk/bsd.pkg.mk     Sat Oct 13 10:52:30 2007 +0000
+++ b/mk/bsd.pkg.mk     Sat Oct 13 11:04:15 2007 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.mk,v 1.1927 2007/10/09 19:19:11 martti Exp $
+#      $NetBSD: bsd.pkg.mk,v 1.1928 2007/10/13 11:04:16 dsl Exp $
 #
 # This file is in the public domain.
 #
@@ -19,28 +19,28 @@
 #    build
 #
 
-.include "${.PARSEDIR}/misc/common.mk"
+.include "misc/common.mk"
 
 .if defined(EMUL_PLATFORMS) && !empty(EMUL_PLATFORMS)
-.  include "${.PARSEDIR}/emulator/emulator.mk"
+.  include "emulator/emulator.mk"
 .endif
 
-.include "${.PARSEDIR}/features/features.mk"
+.include "features/features.mk"
 
-.include "${.PARSEDIR}/flavor/bsd.flavor-vars.mk"
-.include "${.PARSEDIR}/check/bsd.check-vars.mk"
-.include "${.PARSEDIR}/depends/bsd.depends-vars.mk"
-.include "${.PARSEDIR}/fetch/bsd.fetch-vars.mk"
-.include "${.PARSEDIR}/checksum/bsd.checksum-vars.mk"
-.include "${.PARSEDIR}/extract/bsd.extract-vars.mk"
-.include "${.PARSEDIR}/patch/bsd.patch-vars.mk"
-.include "${.PARSEDIR}/configure/bsd.configure-vars.mk"
-.include "${.PARSEDIR}/build/bsd.build-vars.mk"
-.include "${.PARSEDIR}/install/bsd.install-vars.mk"
+.include "flavor/bsd.flavor-vars.mk"
+.include "check/bsd.check-vars.mk"
+.include "depends/bsd.depends-vars.mk"
+.include "fetch/bsd.fetch-vars.mk"
+.include "checksum/bsd.checksum-vars.mk"
+.include "extract/bsd.extract-vars.mk"
+.include "patch/bsd.patch-vars.mk"
+.include "configure/bsd.configure-vars.mk"
+.include "build/bsd.build-vars.mk"
+.include "install/bsd.install-vars.mk"
 
-.include "${.PARSEDIR}/bsd.pkg.error.mk"
+.include "bsd.pkg.error.mk"
 
-.include "${.PARSEDIR}/bsd.hacks.mk"
+.include "bsd.hacks.mk"
 
 ############################################################################
 # Transform package Makefile variables and set defaults
@@ -106,7 +106,7 @@
 
 ##### Transform USE_* into dependencies
 
-.include "${.PARSEDIR}/bsd.pkg.use.mk"
+.include "bsd.pkg.use.mk"
 
 ############################################################################
 # Sanity checks
@@ -329,7 +329,7 @@
 
 # Handle alternatives
 #
-.include "${.PARSEDIR}/alternatives.mk"
+.include "alternatives.mk"
 
 # Define SMART_MESSAGES in /etc/mk.conf for messages giving the tree
 # of dependencies for building, and the current target.
@@ -410,19 +410,19 @@
 .endif
 
 # INSTALL/DEINSTALL script framework
-.include "${.PARSEDIR}/pkginstall/bsd.pkginstall.mk"
+.include "pkginstall/bsd.pkginstall.mk"
 
 # Locking
-.include "${.PARSEDIR}/internal/locking.mk"
+.include "internal/locking.mk"
 
 # Tools
-.include "${.PARSEDIR}/tools/bsd.tools.mk"
+.include "tools/bsd.tools.mk"
 
 # Barrier
-.include "${.PARSEDIR}/bsd.pkg.barrier.mk"
+.include "bsd.pkg.barrier.mk"
 
 # Unprivileged builds
-.include "${.PARSEDIR}/unprivileged.mk"
+.include "unprivileged.mk"
 
 # If NO_BUILD is defined, default to not needing a compiler.
 .if defined(NO_BUILD)
@@ -432,9 +432,9 @@
 # Get the proper dependencies and set the PATH to use the compiler
 # named in PKGSRC_COMPILER.
 #
-.include "${.PARSEDIR}/compiler.mk"
+.include "compiler.mk"
 
-.include "${.PARSEDIR}/wrapper/bsd.wrapper.mk"
+.include "wrapper/bsd.wrapper.mk"
 
 .if defined(ABI_DEPENDS) || defined(BUILD_ABI_DEPENDS)
 .  if !empty(USE_ABI_DEPENDS:M[yY][eE][sS])
@@ -448,7 +448,7 @@
 # Find out the PREFIX of dependencies where the PREFIX is needed at build time.
 .if defined(EVAL_PREFIX)
 FIND_PREFIX:=  ${EVAL_PREFIX}
-.  include "${.PARSEDIR}/find-prefix.mk"
+.  include "find-prefix.mk"
 .endif
 
 .if !defined(_PATH_ORIG)
@@ -600,21 +600,21 @@
        fi
 .endif
 
-.include "${.PARSEDIR}/flavor/bsd.flavor.mk"
+.include "flavor/bsd.flavor.mk"
 
-.include "${.PARSEDIR}/depends/bsd.depends.mk"
-.include "${.PARSEDIR}/check/bsd.check.mk"
-.include "${.PARSEDIR}/fetch/bsd.fetch.mk"
-.include "${.PARSEDIR}/checksum/bsd.checksum.mk"
-.include "${.PARSEDIR}/extract/bsd.extract.mk"
-.include "${.PARSEDIR}/patch/bsd.patch.mk"
-.include "${.PARSEDIR}/configure/bsd.configure.mk"
-.include "${.PARSEDIR}/build/bsd.build.mk"
-.include "${.PARSEDIR}/install/bsd.install.mk"
-.include "${.PARSEDIR}/package/bsd.package.mk"
+.include "depends/bsd.depends.mk"
+.include "check/bsd.check.mk"
+.include "fetch/bsd.fetch.mk"
+.include "checksum/bsd.checksum.mk"
+.include "extract/bsd.extract.mk"
+.include "patch/bsd.patch.mk"
+.include "configure/bsd.configure.mk"
+.include "build/bsd.build.mk"
+.include "install/bsd.install.mk"
+.include "package/bsd.package.mk"
 
-.include "${.PARSEDIR}/bsd.pkg.clean.mk"
-.include "${.PARSEDIR}/bsd.pkg.update.mk"
+.include "bsd.pkg.clean.mk"
+.include "bsd.pkg.update.mk"
 
 # su-target is a macro target that does just-in-time su-to-root before
 # reinvoking the make process as root.  It acquires root privileges and
@@ -676,7 +676,7 @@
 
 _SHORT_UNAME_R=        ${:!${UNAME} -r!:C@\.([0-9]*)[_.].*@.\1@} # n.n[_.]anything => n.n
 
-.include "${.PARSEDIR}/install/bin-install.mk"
+.include "install/bin-install.mk"
 
 .PHONY: show-pkgtools-version
 .if !target(show-pkgtools-version)
@@ -745,22 +745,22 @@
 tags:
 .endif
 
-.include "${.PARSEDIR}/plist/bsd.plist.mk"
+.include "plist/bsd.plist.mk"
 
-.include "${.PARSEDIR}/bsd.utils.mk"
+.include "bsd.utils.mk"
 
-.include "${.PARSEDIR}/subst.mk"
+.include "subst.mk"
 
 #
 # For bulk build targets (bulk-install, bulk-package), the
 # BATCH variable must be set in /etc/mk.conf:
 #
 .if defined(BATCH)
-.  include "${.PARSEDIR}/bulk/bsd.bulk-pkg.mk"
+.  include "bulk/bsd.bulk-pkg.mk"
 .endif
 
 # README generation code.
-.include "${.PARSEDIR}/bsd.pkg.readme.mk"
+.include "bsd.pkg.readme.mk"
 
 # Create a PKG_ERROR_HANDLER shell command for each class listed in
 # PKG_ERROR_CLASSES.  The error handler is meant to be invoked within
@@ -804,15 +804,15 @@
 .endfor
 
 .if make(pbulk-index) || make(pbulk-index-item) || make(pbulk-save-wrkdir)
-.include "${.PARSEDIR}/pbulk/pbulk-index.mk"
+.include "pbulk/pbulk-index.mk"
 .endif
 
 .if defined(PKG_DEVELOPER)
-.  include "${.PARSEDIR}/misc/developer.mk"
+.  include "misc/developer.mk"
 .endif
-.include "${.PARSEDIR}/misc/show.mk"
+.include "misc/show.mk"
 .if make(debug)
-.  include "${.PARSEDIR}/bsd.pkg.debug.mk"
+.  include "bsd.pkg.debug.mk"
 .endif
-.include "${.PARSEDIR}/misc/warnings.mk"
-.include "${.PARSEDIR}/misc/can-be-built-here.mk"
+.include "misc/warnings.mk"
+.include "misc/can-be-built-here.mk"
diff -r 0da091af67f3 -r 8ecbf10e9690 mk/bsd.pkg.subdir.mk
--- a/mk/bsd.pkg.subdir.mk      Sat Oct 13 10:52:30 2007 +0000
+++ b/mk/bsd.pkg.subdir.mk      Sat Oct 13 11:04:15 2007 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.pkg.subdir.mk,v 1.68 2007/08/13 08:12:51 rillig Exp $
+#      $NetBSD: bsd.pkg.subdir.mk,v 1.69 2007/10/13 11:04:16 dsl Exp $
 #      Derived from: FreeBSD Id: bsd.port.subdir.mk,v 1.19 1997/03/09 23:10:56 wosch Exp
 #      from: @(#)bsd.subdir.mk 5.9 (Berkeley) 2/1/91
 #
@@ -26,7 +26,7 @@
 #      mirror-distfiles, bulk-install, bulk-package, ${PKG_MISC_TARGETS}
 #
 
-.include "${.PARSEDIR}/misc/common.mk"
+.include "misc/common.mk"
 
 AWK?=          /usr/bin/awk
 CAT?=          /bin/cat
diff -r 0da091af67f3 -r 8ecbf10e9690 mk/check/bsd.check.mk
--- a/mk/check/bsd.check.mk     Sat Oct 13 10:52:30 2007 +0000
+++ b/mk/check/bsd.check.mk     Sat Oct 13 11:04:15 2007 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.check.mk,v 1.5 2006/12/12 21:37:20 rillig Exp $
+# $NetBSD: bsd.check.mk,v 1.6 2007/10/13 11:04:17 dsl Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to build and install checks.
@@ -25,14 +25,14 @@
 #    check-interpreter, check-shlibs, check-vulnerable, check-wrkref
 #
 
-.include "${.PARSEDIR}/check-files.mk"
-.include "${.PARSEDIR}/check-headers.mk"
-.include "${.PARSEDIR}/check-interpreter.mk"
-.include "${.PARSEDIR}/check-perms.mk"
-.include "${.PARSEDIR}/check-portability.mk"
-.include "${.PARSEDIR}/check-shlibs.mk"
-.include "${.PARSEDIR}/check-vulnerable.mk"
-.include "${.PARSEDIR}/check-wrkref.mk"
+.include "check-files.mk"
+.include "check-headers.mk"
+.include "check-interpreter.mk"
+.include "check-perms.mk"
+.include "check-portability.mk"
+.include "check-shlibs.mk"
+.include "check-vulnerable.mk"
+.include "check-wrkref.mk"
 
 pre-configure-checks-hook \
 pre-build-checks-hook: .PHONY
diff -r 0da091af67f3 -r 8ecbf10e9690 mk/emulator/darwin.mk