diff options
| author | joerg <joerg> | 2007-01-25 15:37:12 +0000 |
|---|---|---|
| committer | joerg <joerg> | 2007-01-25 15:37:12 +0000 |
| commit | 0683e3f9562b356ae25da24ca51a3129a959f23c (patch) | |
| tree | 612cd4f96fec88b377eb1f0ebccc8696d9fd126d /mk | |
| parent | 3b741523d79c7b9dbba84d976c4fd65e4e108884 (diff) | |
| download | pkgsrc-0683e3f9562b356ae25da24ca51a3129a959f23c.tar.gz | |
Absolute never use .x11-buildlink. Some cases get nasty to fix, so
back to this.
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/buildlink3/bsd.buildlink3.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk index 6bda459761b..4472845b5ff 100644 --- a/mk/buildlink3/bsd.buildlink3.mk +++ b/mk/buildlink3/bsd.buildlink3.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.buildlink3.mk,v 1.191 2007/01/17 03:11:19 rillig Exp $ +# $NetBSD: bsd.buildlink3.mk,v 1.192 2007/01/25 15:37:12 joerg Exp $ # # Copyright (c) 2004 The NetBSD Foundation, Inc. # All rights reserved. @@ -89,7 +89,11 @@ ECHO_BUILDLINK_MSG?= ${ECHO_WRAPPER_MSG} BUILDLINK_DIR= ${WRKDIR}/.buildlink BUILDLINK_BINDIR= ${BUILDLINK_DIR}/bin BUILDLINK_SRCDIR= ${.CURDIR}/../../mk/buildlink3 +.if ${X11_TYPE} == "modular" +BUILDLINK_X11_DIR= ${BUILDLINK_DIR} +.else BUILDLINK_X11_DIR= ${BUILDLINK_DIR:H}/.x11-buildlink +.endif .PHONY: do-buildlink |