From 64c83961643743b2423afc56e568e2cb05963660 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Fri, 27 Aug 2004 06:29:06 +0000
Subject: Replace RPATH_FLAG with LINKER_RPATH_FLAG and COMPILER_RPATH_FLAG,
 which are the full option names used to set rpath directives for the linker
 and the compiler, respectively.  In places were we are invoking the linker,
 use "${LINKER_RPATH_FLAG} <path>", where the space is inserted in case the
 flag is a word, e.g. -rpath.  The default values of *_RPATH_FLAG are set by
 the compiler/*.mk files, depending on the compiler that you use.  They may be
 overridden on a ${OPSYS}-specific basis by setting _OPSYS_LINKER_RPATH_FLAG
 and _OPSYS_COMPILER_RPATH_FLAG, respectively.  Garbage-collect
 _OPSYS_RPATH_NAME and _COMPILER_LD_FLAG.

---
 emulators/mips64emul/Makefile | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'emulators')

diff --git a/emulators/mips64emul/Makefile b/emulators/mips64emul/Makefile
index a05b061019f..89376b35b57 100644
--- a/emulators/mips64emul/Makefile
+++ b/emulators/mips64emul/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2004/08/04 06:22:25 xtraeme Exp $
+# $NetBSD: Makefile,v 1.9 2004/08/27 06:29:07 jlam Exp $
 #
 
 DISTNAME=	mips64emul-0.2
@@ -17,8 +17,7 @@ HAS_CONFIGURE=	yes
 
 INSTALLATION_DIRS=	bin share/doc/${PKGBASE}
 
-GLOBAL_LDFLAGS=	-L${X11BASE}/lib \
-		${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib
+GLOBAL_LDFLAGS=	-L${X11BASE}/lib ${COMPILER_RPATH_FLAG}${X11BASE}/lib
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mips64emul ${PREFIX}/bin
-- 
cgit v1.2.3