From 63ee7336e7fb95fc1c0667dd2e17d8edc3c92ce3 Mon Sep 17 00:00:00 2001 From: jlam Date: Mon, 23 Sep 2002 08:35:12 +0000 Subject: 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. --- mk/bsd.pkg.mk | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'mk/bsd.pkg.mk') 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 -- cgit v1.2.3