summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2019-06-30 21:28:28 +0000
committerrillig <rillig@pkgsrc.org>2019-06-30 21:28:28 +0000
commit57ad937df1221aaf3a1bacae0b27a7256c1369ac (patch)
treef0d2532d680560cc03d56ac5112723df7ec36118 /mk
parenta6142a03efb6c3b2a58e2942efaf5ae6301f55bd (diff)
downloadpkgsrc-57ad937df1221aaf3a1bacae0b27a7256c1369ac.tar.gz
mk: use direct include paths
This saves a few system calls since the included files are searched first in .PARSEDIR and only then in .CURDIR.
Diffstat (limited to 'mk')
-rw-r--r--mk/oss.buildlink3.mk6
-rw-r--r--mk/oss.builtin.mk4
-rw-r--r--mk/pthread.buildlink3.mk6
-rw-r--r--mk/pthread.builtin.mk4
4 files changed, 10 insertions, 10 deletions
diff --git a/mk/oss.buildlink3.mk b/mk/oss.buildlink3.mk
index 8ceff5cf8fe..4014e3ab623 100644
--- a/mk/oss.buildlink3.mk
+++ b/mk/oss.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: oss.buildlink3.mk,v 1.12 2017/05/28 21:53:06 maya Exp $
+# $NetBSD: oss.buildlink3.mk,v 1.13 2019/06/30 21:28:28 rillig Exp $
#
# This Makefile fragment is included by packages that require an Open Sound
# System (OSS) implementation. After inclusion of this file, the following
@@ -11,12 +11,12 @@
#
OSS_BUILDLINK3_MK:= ${OSS_BUILDLINK3_MK}+
-.include "../../mk/bsd.prefs.mk"
+.include "bsd.prefs.mk"
.if !defined(_OSS_TYPE)
_OSS_TYPE= none
CHECK_BUILTIN.oss:= yes
-. include "../../mk/oss.builtin.mk"
+. include "oss.builtin.mk"
CHECK_BUILTIN.oss:= no
. if defined(IS_BUILTIN.oss) && !empty(IS_BUILTIN.oss:M[yY][eE][sS])
_OSS_TYPE= native
diff --git a/mk/oss.builtin.mk b/mk/oss.builtin.mk
index 495a760843a..3be09d207ea 100644
--- a/mk/oss.builtin.mk
+++ b/mk/oss.builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: oss.builtin.mk,v 1.5 2016/09/18 05:25:18 richard Exp $
+# $NetBSD: oss.builtin.mk,v 1.6 2019/06/30 21:28:28 rillig Exp $
BUILTIN_PKG:= oss
@@ -8,7 +8,7 @@ BUILTIN_FIND_HEADERS.H_SOUNDCARD= soundcard.h \
linux/soundcard.h \
sys/soundcard.h
-.include "../../mk/buildlink3/bsd.builtin.mk"
+.include "buildlink3/bsd.builtin.mk"
###
### Determine if there is a built-in implementation of the package and
diff --git a/mk/pthread.buildlink3.mk b/mk/pthread.buildlink3.mk
index 6498f0bb951..182fc4cb9f0 100644
--- a/mk/pthread.buildlink3.mk
+++ b/mk/pthread.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pthread.buildlink3.mk,v 1.32 2016/04/11 04:22:34 dbj Exp $
+# $NetBSD: pthread.buildlink3.mk,v 1.33 2019/06/30 21:28:28 rillig Exp $
#
# The pthreads strategy for pkgsrc is to "bless" a particular pthread
# package as the Official Pthread Replacement (OPR). The following
@@ -79,12 +79,12 @@ _PKG_PTHREAD_BUILDLINK3_MK?= ${_PKG_PTHREAD_PKGSRCDIR}/buildlink3.mk
# can actually be used to replace a native pthreads.
_PKG_PTHREAD_COMPAT_PATTERNS= *-*-*
-.include "../../mk/bsd.fast.prefs.mk"
+.include "bsd.fast.prefs.mk"
PTHREAD_OPTS?= # empty
CHECK_BUILTIN.pthread:= yes
-.include "../../mk/pthread.builtin.mk"
+.include "pthread.builtin.mk"
CHECK_BUILTIN.pthread:= no
#
diff --git a/mk/pthread.builtin.mk b/mk/pthread.builtin.mk
index 883f91066c7..9b918388441 100644
--- a/mk/pthread.builtin.mk
+++ b/mk/pthread.builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: pthread.builtin.mk,v 1.15 2013/11/23 09:10:14 obache Exp $
+# $NetBSD: pthread.builtin.mk,v 1.16 2019/06/30 21:28:28 rillig Exp $
BUILTIN_PKG:= pthread
@@ -6,7 +6,7 @@ BUILTIN_FIND_LIBS:= pthread c_r rt
BUILTIN_FIND_HEADERS_VAR= H_PTHREAD
BUILTIN_FIND_HEADERS.H_PTHREAD= pthread.h
-.include "../../mk/buildlink3/bsd.builtin.mk"
+.include "buildlink3/bsd.builtin.mk"
###
### Determine if there is a built-in implementation of the package and