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.

---
 wm/amiwm/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'wm')

diff --git a/wm/amiwm/Makefile b/wm/amiwm/Makefile
index 886c138d0f2..0f7b5e648be 100644
--- a/wm/amiwm/Makefile
+++ b/wm/amiwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2004/03/10 14:12:50 xtraeme Exp $
+# $NetBSD: Makefile,v 1.10 2004/08/27 06:29:11 jlam Exp $
 #
 
 DISTNAME=	amiwm0.20pl48
@@ -22,7 +22,7 @@ CONFIGURE_ENV=	CFLAGS="-DHAVE_X11_EXTENSIONS_SHAPE_H=1 -O" \
 		X_PRE_LIBS="${X_PRE_LIBS}" \
 		X_EXTRA_LIBS="-lXt"
 
-X_PRE_LIBS=	-Wl,${RPATH_FLAG}${X11BASE}/lib
+X_PRE_LIBS=	${COMPILER_RPATH_FLAG}${X11BASE}/lib
 FIX_RPATH+=	X_PRE_LIBS
 
 .include "../../mk/bsd.pkg.mk"
-- 
cgit v1.2.3