diff options
| author | jlam <jlam> | 2001-06-12 18:58:42 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2001-06-12 18:58:42 +0000 |
| commit | 6e57510335b3be98edbb31bdd1b177ccce7f9e25 (patch) | |
| tree | 30d363035dea60a1610424ecfcf0240df31c5c7b | |
| parent | 80db40ea2c11bc0325dc175052cf92e7ca724549 (diff) | |
| download | pkgsrc-6e57510335b3be98edbb31bdd1b177ccce7f9e25.tar.gz | |
Fix inclusion of defs.*.mk files so that it works from anywhere in the
pkgsrc tree that contains a Makefile.
| -rw-r--r-- | mk/bsd.prefs.mk | 18 |
1 files changed, 13 insertions, 5 deletions
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk index 16626a4a70f..1f277919988 100644 --- a/mk/bsd.prefs.mk +++ b/mk/bsd.prefs.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.prefs.mk,v 1.39 2001/06/12 12:49:55 jlam Exp $ +# $NetBSD: bsd.prefs.mk,v 1.40 2001/06/12 18:58:42 jlam Exp $ # # Make file, included to get the site preferences, if any. Should # only be included by package Makefiles before any .if defined() @@ -117,10 +117,18 @@ USE_INET6?= NO # Load the OS-specific definitions for program variables. Default to loading # the NetBSD ones if an OS-specific file doesn't exist. -.if exists(../../mk/defs.${OPSYS}.mk) -.include "../../mk/defs.${OPSYS}.mk" -.else -.include "../../mk/defs.NetBSD.mk" +.if exists(${.CURDIR}/../../mk/defs.${OPSYS}.mk) +.include "${.CURDIR}/../../mk/defs.${OPSYS}.mk" +.elif exists(${.CURDIR}/../mk/defs.${OPSYS}.mk) +.include "${.CURDIR}/../mk/defs.${OPSYS}.mk" +.elif exists(${.CURDIR}/mk/defs.${OPSYS}.mk) +.include "${.CURDIR}/mk/defs.${OPSYS}.mk" +.elif exists(${.CURDIR}/../../mk/defs.NetBSD.mk) +.include "${.CURDIR}/../../mk/defs.NetBSD.mk" +.elif exists(${.CURDIR}/../mk/defs.NetBSD.mk) +.include "${.CURDIR}/../mk/defs.NetBSD.mk" +.else exists(${.CURDIR}/mk/defs.NetBSD.mk) +.include "${.CURDIR}/mk/defs.NetBSD.mk" .endif # Check if we got Mesa distributed with XFree86 4.x or if we need to |