[pkgsrc/trunk]: pkgsrc/mk Made the .include directives simpler, since the dir...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7654f816b2aa
branches:  trunk
changeset: 537128:7654f816b2aa
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Fri Jan 04 01:46:24 2008 +0000

description:
Made the .include directives simpler, since the directory of the
including file is always the first in the search path.

diffstat:

 mk/bsd.prefs.mk               |  12 ++++++------
 mk/build/bsd.build.mk         |   6 +++---
 mk/checksum/bsd.checksum.mk   |   4 ++--
 mk/configure/bsd.configure.mk |   4 ++--
 mk/configure/configure.mk     |  18 +++++++++---------
 mk/depends/bsd.depends.mk     |   4 ++--
 mk/flavor/bsd.flavor-vars.mk  |   4 ++--
 mk/install/bsd.install.mk     |   4 ++--
 mk/package/bsd.package.mk     |   4 ++--
 mk/patch/bsd.patch.mk         |   4 ++--
 mk/tools/bsd.tools.mk         |  34 +++++++++++++++++-----------------
 mk/tools/replace.mk           |   4 ++--
 12 files changed, 51 insertions(+), 51 deletions(-)

diffs (292 lines):

diff -r ae066505140a -r 7654f816b2aa mk/bsd.prefs.mk
--- a/mk/bsd.prefs.mk   Fri Jan 04 01:43:58 2008 +0000
+++ b/mk/bsd.prefs.mk   Fri Jan 04 01:46:24 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.273 2007/10/17 10:37:43 rillig Exp $
+# $NetBSD: bsd.prefs.mk,v 1.274 2008/01/04 01:46:24 rillig Exp $
 #
 # This file includes the mk.conf file, which contains the user settings.
 #
@@ -616,21 +616,21 @@
 PREPEND_PATH+=         ${LOCALBASE}/bin
 
 # Wrapper framework definitions
-.include "${PKGSRCDIR}/mk/wrapper/wrapper-defs.mk"
+.include "wrapper/wrapper-defs.mk"
 
 # Binary emulator framework definitions
 .if defined(EMUL_PLATFORMS) && !empty(EMUL_PLATFORMS)
-.  include "${PKGSRCDIR}/mk/emulator/emulator-vars.mk"
+.  include "emulator/emulator-vars.mk"
 .endif
 
 # System features framework
-.include "${PKGSRCDIR}/mk/features/features-vars.mk"
+.include "features/features-vars.mk"
 
 # Package system flavor definitions
-.include "${PKGSRCDIR}/mk/flavor/bsd.flavor-vars.mk"
+.include "flavor/bsd.flavor-vars.mk"
 
 # Make variable definitions cache
-.include "${PKGSRCDIR}/mk/bsd.makevars.mk"
+.include "bsd.makevars.mk"
 
 # If MAKECONF is defined, then pass it down to all recursive make
 # processes invoked by pkgsrc.
diff -r ae066505140a -r 7654f816b2aa mk/build/bsd.build.mk
--- a/mk/build/bsd.build.mk     Fri Jan 04 01:43:58 2008 +0000
+++ b/mk/build/bsd.build.mk     Fri Jan 04 01:46:24 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.build.mk,v 1.9 2007/02/06 20:48:07 rillig Exp $
+# $NetBSD: bsd.build.mk,v 1.10 2008/01/04 01:46:26 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to building sources for a package.
@@ -30,7 +30,7 @@
 ###
 .PHONY: build
 .if !defined(NO_BUILD)
-.  include "${PKGSRCDIR}/mk/build/build.mk"
+.  include "build.mk"
 .elif !target(build)
 .  if exists(${_COOKIE.build})
 build:
@@ -42,7 +42,7 @@
 .  endif
 .endif
 
-.include "${PKGSRCDIR}/mk/build/test.mk"
+.include "test.mk"
 
 ######################################################################
 ### build-cookie (PRIVATE)
diff -r ae066505140a -r 7654f816b2aa mk/checksum/bsd.checksum.mk
--- a/mk/checksum/bsd.checksum.mk       Fri Jan 04 01:43:58 2008 +0000
+++ b/mk/checksum/bsd.checksum.mk       Fri Jan 04 01:46:24 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.checksum.mk,v 1.7 2007/08/31 16:30:11 jlam Exp $
+# $NetBSD: bsd.checksum.mk,v 1.8 2008/01/04 01:46:26 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and defines the
 # relevant variables and targets for the "checksum" phase.
@@ -47,5 +47,5 @@
 checksum checksum-phase makesum makepatchsum mps mdi makedistinfo distinfo:
        @${DO_NADA}
 .else
-.  include "${PKGSRCDIR}/mk/checksum/checksum.mk"
+.  include "checksum.mk"
 .endif
diff -r ae066505140a -r 7654f816b2aa mk/configure/bsd.configure.mk
--- a/mk/configure/bsd.configure.mk     Fri Jan 04 01:43:58 2008 +0000
+++ b/mk/configure/bsd.configure.mk     Fri Jan 04 01:46:24 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.configure.mk,v 1.10 2007/03/07 01:27:28 rillig Exp $
+# $NetBSD: bsd.configure.mk,v 1.11 2008/01/04 01:46:26 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to configuring packages for building.
@@ -21,7 +21,7 @@
 ###
 .PHONY: configure
 .if !defined(NO_CONFIGURE)
-.  include "${PKGSRCDIR}/mk/configure/configure.mk"
+.  include "configure.mk"
 .elif !target(configure)
 .  if exists(${_COOKIE.configure})
 configure:
diff -r ae066505140a -r 7654f816b2aa mk/configure/configure.mk
--- a/mk/configure/configure.mk Fri Jan 04 01:43:58 2008 +0000
+++ b/mk/configure/configure.mk Fri Jan 04 01:46:24 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: configure.mk,v 1.21 2007/12/12 01:00:40 markd Exp $
+# $NetBSD: configure.mk,v 1.22 2008/01/04 01:46:26 rillig Exp $
 #
 # = Package-settable variables =
 #
@@ -61,26 +61,26 @@
 _BUILD_DEFS+=          CONFIGURE_ENV CONFIGURE_ARGS CMAKE_ARGS
 
 .if defined(GNU_CONFIGURE)
-.  include "${PKGSRCDIR}/mk/configure/gnu-configure.mk"
+.  include "gnu-configure.mk"
 .endif
 .if defined(OVERRIDE_GNU_CONFIG_SCRIPTS)
-.  include "${PKGSRCDIR}/mk/configure/config-override.mk"
+.  include "config-override.mk"
 .endif
 .if defined(INSTALL_SH_OVERRIDE) && empty(INSTALL_SH_OVERRIDE:M[Nn][Oo])
-.  include "${PKGSRCDIR}/mk/configure/install-sh-override.mk"
+.  include "install-sh-override.mk"
 .endif
 .if defined(USE_LIBTOOL)
-.  include "${PKGSRCDIR}/mk/configure/libtool-override.mk"
+.  include "libtool-override.mk"
 .endif
 .if defined(PKGCONFIG_OVERRIDE)
-.  include "${PKGSRCDIR}/mk/configure/pkg-config-override.mk"
+.  include "pkg-config-override.mk"
 .endif
-.include "${PKGSRCDIR}/mk/configure/replace-interpreter.mk"
+.include "replace-interpreter.mk"
 .if defined(USE_PKGLOCALEDIR)
-.  include "${PKGSRCDIR}/mk/configure/replace-localedir.mk"
+.  include "replace-localedir.mk"
 .endif
 .if defined(USE_CMAKE)
-.  include "${PKGSRCDIR}/mk/configure/cmake.mk"
+.  include "cmake.mk"
 .endif
 
 ######################################################################
diff -r ae066505140a -r 7654f816b2aa mk/depends/bsd.depends.mk
--- a/mk/depends/bsd.depends.mk Fri Jan 04 01:43:58 2008 +0000
+++ b/mk/depends/bsd.depends.mk Fri Jan 04 01:46:24 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.depends.mk,v 1.14 2007/05/22 16:17:15 joerg Exp $
+# $NetBSD: bsd.depends.mk,v 1.15 2008/01/04 01:46:27 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to dependencies.
@@ -45,7 +45,7 @@
 ###
 .PHONY: depends
 .if ${SKIP_DEPENDS:M[Nn][Oo]} != ""
-.  include "${PKGSRCDIR}/mk/depends/depends.mk"
+.  include "depends.mk"
 .elif !target(depends)
 .  if exists(${_COOKIE.depends})
 depends:
diff -r ae066505140a -r 7654f816b2aa mk/flavor/bsd.flavor-vars.mk
--- a/mk/flavor/bsd.flavor-vars.mk      Fri Jan 04 01:43:58 2008 +0000
+++ b/mk/flavor/bsd.flavor-vars.mk      Fri Jan 04 01:46:24 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.flavor-vars.mk,v 1.1 2006/06/03 23:11:42 jlam Exp $
+# $NetBSD: bsd.flavor-vars.mk,v 1.2 2008/01/04 01:46:27 rillig Exp $
 #
 # This Makefile fragment is included by bsd.prefs.mk and defines some
 # variables which must be defined earlier than where bsd.flavor.mk
@@ -8,4 +8,4 @@
 # Default to the pkgsrc-package flavor.
 PKG_FLAVOR?=   pkg
 
-.sinclude "${PKGSRCDIR}/mk/flavor/${PKG_FLAVOR}/flavor-vars.mk"
+.sinclude "${PKG_FLAVOR}/flavor-vars.mk"
diff -r ae066505140a -r 7654f816b2aa mk/install/bsd.install.mk
--- a/mk/install/bsd.install.mk Fri Jan 04 01:43:58 2008 +0000
+++ b/mk/install/bsd.install.mk Fri Jan 04 01:46:24 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.install.mk,v 1.11 2007/11/03 09:12:46 rillig Exp $
+# $NetBSD: bsd.install.mk,v 1.12 2008/01/04 01:46:27 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to installing packages.
@@ -21,7 +21,7 @@
 ###
 .PHONY: install
 .if !defined(NO_INSTALL)
-.  include "${PKGSRCDIR}/mk/install/install.mk"
+.  include "install.mk"
 .elif !target(install)
 .  if exists(${_COOKIE.install})
 install:
diff -r ae066505140a -r 7654f816b2aa mk/package/bsd.package.mk
--- a/mk/package/bsd.package.mk Fri Jan 04 01:43:58 2008 +0000
+++ b/mk/package/bsd.package.mk Fri Jan 04 01:46:24 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.package.mk,v 1.9 2006/10/09 11:44:07 joerg Exp $
+# $NetBSD: bsd.package.mk,v 1.10 2008/01/04 01:46:27 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and provides all
 # variables and targets related to binary packages.
@@ -16,7 +16,7 @@
 ###
 .PHONY: package
 .if !defined(NO_PACKAGE)
-.  include "${PKGSRCDIR}/mk/package/package.mk"
+.  include "package.mk"
 .elif !target(package)
 .  if exists(${_COOKIE.package})
 package:
diff -r ae066505140a -r 7654f816b2aa mk/patch/bsd.patch.mk
--- a/mk/patch/bsd.patch.mk     Fri Jan 04 01:43:58 2008 +0000
+++ b/mk/patch/bsd.patch.mk     Fri Jan 04 01:46:24 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.patch.mk,v 1.1 2006/06/06 04:48:19 jlam Exp $
+# $NetBSD: bsd.patch.mk,v 1.2 2008/01/04 01:46:27 rillig Exp $
 #
 # This Makefile fragment is included by bsd.pkg.mk and defines the
 # relevant variables and targets for the "patch" phase.
@@ -12,4 +12,4 @@
 #    pre-patch, do-patch, post-patch
 #
 
-.include "${PKGSRCDIR}/mk/patch/patch.mk"
+.include "patch.mk"
diff -r ae066505140a -r 7654f816b2aa mk/tools/bsd.tools.mk
--- a/mk/tools/bsd.tools.mk     Fri Jan 04 01:43:58 2008 +0000
+++ b/mk/tools/bsd.tools.mk     Fri Jan 04 01:46:24 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.tools.mk,v 1.48 2007/12/18 10:18:40 markd Exp $
+# $NetBSD: bsd.tools.mk,v 1.49 2008/01/04 01:46:27 rillig Exp $
 #
 # Copyright (c) 2005, 2006 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -146,23 +146,23 @@
        @${DO_NADA}
 .endif
 
-.include "${PKGSRCDIR}/mk/tools/digest.mk"
-.include "${PKGSRCDIR}/mk/tools/automake.mk"
-.include "${PKGSRCDIR}/mk/tools/autoconf.mk"
-.include "${PKGSRCDIR}/mk/tools/texinfo.mk"
-.include "${PKGSRCDIR}/mk/tools/gettext.mk"
-.include "${PKGSRCDIR}/mk/tools/intltool.mk"
-.include "${PKGSRCDIR}/mk/tools/ldconfig.mk"
-.include "${PKGSRCDIR}/mk/tools/rpcgen.mk"
-.include "${PKGSRCDIR}/mk/tools/strip.mk"
-.include "${PKGSRCDIR}/mk/tools/cmake.mk"
-.include "${PKGSRCDIR}/mk/tools/imake.mk"
-.include "${PKGSRCDIR}/mk/tools/replace.mk"
-.include "${PKGSRCDIR}/mk/tools/perl.mk"
-.include "${PKGSRCDIR}/mk/tools/pkg-config.mk"
-.include "${PKGSRCDIR}/mk/tools/make.mk"
+.include "digest.mk"
+.include "automake.mk"
+.include "autoconf.mk"
+.include "texinfo.mk"
+.include "gettext.mk"
+.include "intltool.mk"
+.include "ldconfig.mk"
+.include "rpcgen.mk"
+.include "strip.mk"
+.include "cmake.mk"
+.include "imake.mk"
+.include "replace.mk"
+.include "perl.mk"
+.include "pkg-config.mk"
+.include "make.mk"
 
-.include "${PKGSRCDIR}/mk/tools/create.mk"
+.include "create.mk"
 
 _VARGROUPS+=           tools
 _USER_VARS.tools=      TOOLS_SHELL
diff -r ae066505140a -r 7654f816b2aa mk/tools/replace.mk
--- a/mk/tools/replace.mk       Fri Jan 04 01:43:58 2008 +0000
+++ b/mk/tools/replace.mk       Fri Jan 04 01:46:24 2008 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: replace.mk,v 1.203 2007/12/18 10:18:49 markd Exp $
+# $NetBSD: replace.mk,v 1.204 2008/01/04 01:46:27 rillig Exp $
 #
 # Copyright (c) 2005 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -1182,7 +1182,7 @@
 
 # Compute the locations of the pkgsrc-supplied tools.
 FIND_PREFIX:=  ${TOOLS_FIND_PREFIX}
-.include "${PKGSRCDIR}/mk/find-prefix.mk"
+.include "../find-prefix.mk"
 
 ######################################################################