From 0b761742f02e02019f5d40ee37eb1aabbe9eccf0 Mon Sep 17 00:00:00 2001 From: garbled Date: Mon, 14 Sep 1998 17:07:46 +0000 Subject: Add new automatic handling for rpath. This sets the LDFLAGS variable to include rpath statements for /usr/pkg/lib, and if using X11, /usr/X11R6/lib. It also gives us the side benefit of having an LDFLAGS variable in top level makefiles. --- mk/bsd.pkg.mk | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'mk') diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index 2d85090a6bb..b76a70edd3e 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.159 1998/09/07 15:41:28 tv Exp $ +# $NetBSD: bsd.pkg.mk,v 1.160 1998/09/14 17:07:46 garbled Exp $ # # This file is in the public domain. # @@ -188,6 +188,13 @@ MD5?= md5 .endif MD5_FILE?= ${FILESDIR}/md5 +.if defined(USE_MOTIF) || defined(USE_X11) +LDFLAGS+= -Wl,-R${X11BASE}/lib +.endif +LDFLAGS+= -Wl,-R${LOCALBASE}/lib +MAKE_ENV+= LDFLAGS="${LDFLAGS}" +CONFIGURE_ENV+= LDFLAGS="${LDFLAGS}" + MAKE_FLAGS?= MAKEFILE?= Makefile MAKE_ENV+= PATH=${PATH}:${LOCALBASE}/bin:${X11BASE}/bin PREFIX=${PREFIX} LOCALBASE=${LOCALBASE} X11BASE=${X11BASE} MOTIFLIB="${MOTIFLIB}" CFLAGS="${CFLAGS}" -- cgit v1.2.3