summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorjlam <jlam>2002-09-23 08:35:12 +0000
committerjlam <jlam>2002-09-23 08:35:12 +0000
commit865f9626f7606671efdce100135b7bb8b33af639 (patch)
tree35576c96289a9bb5d3be7e0db0a04f2696b4762c /mk
parent0751d0eff1512c05e2cd09eab6eb630899a3c0c2 (diff)
downloadpkgsrc-865f9626f7606671efdce100135b7bb8b33af639.tar.gz
Provide a separate variable "X11_LDFLAGS" that just contains the linker
flags for finding the X11 libraries. The value of X11_LDFLAGS is appended to LDFLAGS if the packages uses X11.
Diffstat (limited to 'mk')
-rw-r--r--mk/bsd.pkg.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 7944895da97..d4016e7d091 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.pkg.mk,v 1.1052 2002/09/22 12:19:36 jlam Exp $
+# $NetBSD: bsd.pkg.mk,v 1.1053 2002/09/23 08:35:12 jlam Exp $
#
# This file is in the public domain.
#
@@ -392,11 +392,13 @@ M4?= /usr/bin/m4
.if !defined(X11_BUILDLINK_MK)
. if defined(USE_X11BASE) || defined(USE_X11)
+X11_LDFLAGS= # empty
. if ${_USE_RPATH} == "yes"
-LDFLAGS+= -Wl,-R${X11BASE}/lib
+X11_LDFLAGS+= -Wl,-R${X11BASE}/lib
. endif
-LDFLAGS+= -L${X11BASE}/lib
+X11_LDFLAGS+= -L${X11BASE}/lib
. endif
+LDFLAGS+= ${X11_LDFLAGS}
.endif
.if ${_USE_RPATH} == "yes"
LDFLAGS+= -Wl,-R${LOCALBASE}/lib