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.

19 files changed, 73 insertions, 67 deletions

diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk
index 55818a28a47..6d66cddf783 100644
--- a/mk/bsd.pkg.mk
+++ b/mk/bsd.pkg.mk
@@ -1,4 +1,4 @@
-#	$NetBSD: bsd.pkg.mk,v 1.1493 2004/08/25 04:09:10 schmonz Exp $
+#	$NetBSD: bsd.pkg.mk,v 1.1494 2004/08/27 06:29:08 jlam Exp $
 #
 # This file is in the public domain.
 #
@@ -440,24 +440,26 @@ SHCOMMENT?=		${ECHO_MSG} >/dev/null '***'
 DISTINFO_FILE?=		${.CURDIR}/distinfo
 
 .if defined(USE_X11)
-X11_LDFLAGS+=		-Wl,${RPATH_FLAG}${X11BASE}/lib${ABI}
+X11_LDFLAGS+=		${COMPILER_RPATH_FLAG}${X11BASE}/lib${ABI}
 X11_LDFLAGS+=		-L${X11BASE}/lib${ABI}
 .endif
 .if !empty(USE_BUILDLINK3:M[nN][oO])
-LDFLAGS+=		-Wl,${RPATH_FLAG}${LOCALBASE}/lib
+LDFLAGS+=		${COMPILER_RPATH_FLAG}${LOCALBASE}/lib
 LDFLAGS+=		-L${LOCALBASE}/lib
 .  if defined(USE_X11)
 LDFLAGS+=		${X11_LDFLAGS}
 .  endif
 .endif
 MAKE_ENV+=		LDFLAGS="${LDFLAGS}"
-MAKE_ENV+=		RPATH_FLAG="${RPATH_FLAG}"
+MAKE_ENV+=		LINKER_RPATH_FLAG="${LINKER_RPATH_FLAG}"
+MAKE_ENV+=		COMPILER_RPATH_FLAG="${COMPILER_RPATH_FLAG}"
 MAKE_ENV+=		WHOLE_ARCHIVE_FLAG="${WHOLE_ARCHIVE_FLAG}"
 MAKE_ENV+=		NO_WHOLE_ARCHIVE_FLAG="${NO_WHOLE_ARCHIVE_FLAG}"
 MAKE_ENV+=		LINK_ALL_LIBGCC_HACK="${LINK_ALL_LIBGCC_HACK}"
 
 CONFIGURE_ENV+=		LDFLAGS="${LDFLAGS:M*}" M4="${M4}" YACC="${YACC}"
-CONFIGURE_ENV+=		RPATH_FLAG="${RPATH_FLAG}"
+CONFIGURE_ENV+=		LINKER_RPATH_FLAG="${LINKER_RPATH_FLAG}"
+CONFIGURE_ENV+=		COMPILER_RPATH_FLAG="${COMPILER_RPATH_FLAG}"
 
 MAKE_FLAGS?=
 MAKEFILE?=		Makefile
@@ -2289,7 +2291,7 @@ do-config-star-override:
 .endif
 
 PKGCONFIG_OVERRIDE_SED= \
-	-e 's|^\(Libs:.*[ 	]\)-L\([ 	]*[^ 	]*\)\(.*\)$$|\1${_COMPILER_LD_FLAG}${RPATH_FLAG}\2 -L\2\3|'
+	-e 's|^\(Libs:.*[ 	]\)-L\([ 	]*[^ 	]*\)\(.*\)$$|\1${COMPILER_RPATH_FLAG}\2 -L\2\3|'
 
 .if defined(PKGCONFIG_OVERRIDE) && !empty(PKGCONFIG_OVERRIDE)
 _CONFIGURE_PREREQ+=		subst-pkgconfig
diff --git a/mk/bsd.prefs.mk b/mk/bsd.prefs.mk
index 2adc58540cb..bad614c97d3 100644
--- a/mk/bsd.prefs.mk
+++ b/mk/bsd.prefs.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.prefs.mk,v 1.164 2004/07/30 20:59:08 jlam Exp $
+# $NetBSD: bsd.prefs.mk,v 1.165 2004/08/27 06:29:09 jlam Exp $
 #
 # Make file, included to get the site preferences, if any.  Should
 # only be included by package Makefiles before any .if defined()
@@ -356,10 +356,23 @@ XMKMF_CMD?=		${X11PREFIX}/bin/xmkmf
 DEPOT_SUBDIR?=		packages
 DEPOTBASE=		${LOCALBASE}/${DEPOT_SUBDIR}
 
-# RPATH_FLAG publicly exports the linker flag used to specify run-time
-# library search paths.
+# LINK_RPATH_FLAG publicly exports the linker flag used to set the
+# run-time library search path.
 #
-RPATH_FLAG?=	${_OPSYS_RPATH_NAME}
+.if defined(_OPSYS_LINKER_RPATH_FLAG)
+LINKER_RPATH_FLAG=	${_OPSYS_LINKER_RPATH_FLAG}
+.else
+LINKER_RPATH_FLAG?=	${_LINKER_RPATH_FLAG}
+.endif
+
+# COMPILER_RPATH_FLAG publicly exports the compiler flag used to pass
+# run-time library search path directives to the linker.
+#
+.if defined(_OPSYS_COMPILER_RPATH_FLAG)
+COMPILER_RPATH_FLAG=	${_OPSYS_COMPILER_RPATH_FLAG}
+.else
+COMPILER_RPATH_FLAG?=	${_COMPILER_RPATH_FLAG}
+.endif
 
 # WHOLE_ARCHIVE_FLAG and NO_WHOLE_ARCHIVE_FLAG publically export the
 # linker flags to extract all symbols from a static archive.
diff --git a/mk/buildlink3/bsd.buildlink3.mk b/mk/buildlink3/bsd.buildlink3.mk
index 0c2b7b566df..e9540a9ec94 100644
--- a/mk/buildlink3/bsd.buildlink3.mk
+++ b/mk/buildlink3/bsd.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.buildlink3.mk,v 1.149 2004/08/13 03:43:23 jlam Exp $
+# $NetBSD: bsd.buildlink3.mk,v 1.150 2004/08/27 06:29:09 jlam Exp $
 #
 # An example package buildlink3.mk file:
 #
@@ -414,8 +414,8 @@ BUILDLINK_LDFLAGS+=	-L${_dir_}
 .  if !empty(BUILDLINK_RPATHDIRS.${_pkg_}) && (${_USE_RPATH} == "yes")
 .    for _dir_ in ${BUILDLINK_RPATHDIRS.${_pkg_}:S/^/${BUILDLINK_PREFIX.${_pkg_}}\//}
 .      if exists(${_dir_})
-.        if empty(BUILDLINK_LDFLAGS:M${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_})
-BUILDLINK_LDFLAGS+=	${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_}
+.        if empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${_dir_})
+BUILDLINK_LDFLAGS+=	${COMPILER_RPATH_FLAG}${_dir_}
 .        endif
 .      endif
 .    endfor
@@ -427,8 +427,8 @@ BUILDLINK_LDFLAGS+=	${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_}
 #
 .if ${PKG_INSTALLATION_TYPE} == "pkgviews"
 .  if (${_USE_RPATH} == "yes") && \
-      empty(BUILDLINK_LDFLAGS:M${_COMPILER_LD_FLAG}${RPATH_FLAG}${PREFIX}/lib)
-BUILDLINK_LDFLAGS+=	${_COMPILER_LD_FLAG}${RPATH_FLAG}${PREFIX}/lib
+      empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${PREFIX}/lib)
+BUILDLINK_LDFLAGS+=	${COMPILER_RPATH_FLAG}${PREFIX}/lib
 .  endif
 .endif
 #
@@ -440,8 +440,8 @@ BUILDLINK_LDFLAGS+=	${_COMPILER_LD_FLAG}${RPATH_FLAG}${PREFIX}/lib
 .  if !empty(BUILDLINK_RPATHDIRS.${_pkg_}) && (${_USE_RPATH} == "yes")
 .    for _dir_ in ${BUILDLINK_RPATHDIRS.${_pkg_}:S/^/${LOCALBASE}\//}
 .      if exists(${_dir_})
-.        if empty(BUILDLINK_LDFLAGS:M${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_})
-BUILDLINK_LDFLAGS+=	${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_}
+.        if empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${_dir_})
+BUILDLINK_LDFLAGS+=	${COMPILER_RPATH_FLAG}${_dir_}
 .        endif
 .      endif
 .    endfor
@@ -451,8 +451,8 @@ BUILDLINK_LDFLAGS+=	${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_}
 # Ensure that ${LOCALBASE}/lib is in the runtime library search path.
 #
 .if (${_USE_RPATH} == "yes") && \
-    empty(BUILDLINK_LDFLAGS:M${_COMPILER_LD_FLAG}${RPATH_FLAG}${LOCALBASE}/lib)
-BUILDLINK_LDFLAGS+=	${_COMPILER_LD_FLAG}${RPATH_FLAG}${LOCALBASE}/lib
+    empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${LOCALBASE}/lib)
+BUILDLINK_LDFLAGS+=	${COMPILER_RPATH_FLAG}${LOCALBASE}/lib
 .endif
 #
 # Add the X11 library directory to the library search paths if the package
@@ -463,8 +463,8 @@ BUILDLINK_LDFLAGS+=	${_COMPILER_LD_FLAG}${RPATH_FLAG}${LOCALBASE}/lib
 BUILDLINK_LDFLAGS+=	-L${X11BASE}/lib${ABI}
 .  endif
 .  if (${_USE_RPATH} == "yes") && \
-      empty(BUILDLINK_LDFLAGS:M${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib${ABI})
-BUILDLINK_LDFLAGS+=	${_COMPILER_LD_FLAG}${RPATH_FLAG}${X11BASE}/lib${ABI}
+      empty(BUILDLINK_LDFLAGS:M${COMPILER_RPATH_FLAG}${X11BASE}/lib${ABI})
+BUILDLINK_LDFLAGS+=	${COMPILER_RPATH_FLAG}${X11BASE}/lib${ABI}
 .  endif
 .endif
 
@@ -1619,8 +1619,6 @@ ${BUILDLINK_DIR}/bin/.libtool-fix-la:					\
 # Seed the common transforming cache with obvious values that greatly
 # speed up the wrappers.
 #
-_BLNK_RPATH_FLAGS=	${RPATH_FLAG}
-_BLNK_RPATH_FLAGS+=	-Wl,${RPATH_FLAG}
 .for _rflag_ in \
 	-Wl,-R -Wl,-rpath, -Wl,--rpath, -Wl,-rpath-link, -Wl,--rpath-link
 .  if empty(_BLNK_RPATH_FLAGS:M${_rflag_})
@@ -1748,8 +1746,6 @@ ${_BLNK_GEN_TRANSFORM}: ${.CURDIR}/../../mk/buildlink3/gen-transform.sh
 		-e "s|@_BLNK_TRANSFORM_SEDFILE@|${_BLNK_TRANSFORM_SEDFILE:Q}|g" \
 		-e "s|@_BLNK_UNTRANSFORM_SEDFILE@|${_BLNK_UNTRANSFORM_SEDFILE:Q}|g" \
 		-e "s|@_BLNK_REORDERLIBS@|${_BLNK_REORDERLIBS:Q}|g"	\
-		-e "s|@_COMPILER_LD_FLAG@|${_COMPILER_LD_FLAG:Q}|g"     \
-		-e "s|@_OPSYS_RPATH_NAME@|${_OPSYS_RPATH_NAME:Q}|g"     \
 		-e "s|@BUILDLINK_SHELL@|${BUILDLINK_SHELL:Q}|g"         \
 		-e "s|@CAT@|${CAT:Q}|g"                                 \
 		${.ALLSRC} > ${.TARGET}.tmp
diff --git a/mk/buildlink3/gen-transform.sh b/mk/buildlink3/gen-transform.sh
index d0734b4ae7c..0de88add302 100644
--- a/mk/buildlink3/gen-transform.sh
+++ b/mk/buildlink3/gen-transform.sh
@@ -1,6 +1,6 @@
 #!@BUILDLINK_SHELL@
 #
-# $NetBSD: gen-transform.sh,v 1.28 2004/08/10 15:13:25 jlam Exp $
+# $NetBSD: gen-transform.sh,v 1.29 2004/08/27 06:29:09 jlam Exp $
 
 transform="@_BLNK_TRANSFORM_SEDFILE@"
 untransform="@_BLNK_UNTRANSFORM_SEDFILE@"
@@ -93,7 +93,6 @@ EOF
 		gen $action mangle:-Wl,-rpath-link,$2:-Wl,-rpath-link,$3
 		gen $action mangle:-Wl,-rpath,$2:-Wl,-rpath,$3
 		gen $action mangle:-Wl,-R$2:-Wl,-R$3
-		gen $action mangle:-Wl,@_OPSYS_RPATH_NAME@$2:-Wl,@_OPSYS_RPATH_NAME@$3
 		gen $action mangle:-R$2:-R$3
 		;;
 	sub-rpath)
@@ -102,7 +101,6 @@ EOF
 		gen $action sub-mangle:-Wl,-rpath-link,$2:-Wl,-rpath-link,$3
 		gen $action sub-mangle:-Wl,-rpath,$2:-Wl,-rpath,$3
 		gen $action sub-mangle:-Wl,-R$2:-Wl,-R$3
-		gen $action sub-mangle:-Wl,@_OPSYS_RPATH_NAME@$2:-Wl,@_OPSYS_RPATH_NAME@$3
 		gen $action sub-mangle:-R$2:-R$3
 		;;
 	abs-rpath)
@@ -111,7 +109,6 @@ EOF
 		gen $action __r:-Wl,-rpath-link,\\.
 		gen $action __r:-Wl,-rpath,\\.
 		gen $action __r:-Wl,-R\\.
-		gen $action __r:-Wl,@_OPSYS_RPATH_NAME@\\.
 		gen $action __r:-R\\.
 		;;
 	no-rpath)
@@ -120,7 +117,6 @@ EOF
 		gen $action __r:-Wl,-rpath-link,
 		gen $action __r:-Wl,-rpath,
 		gen $action __r:-Wl,-R
-		gen $action __r:-Wl,@_OPSYS_RPATH_NAME@
 		gen $action __r:-R
 		;;
 	reorder)
@@ -274,7 +270,6 @@ EOF
 		gen $action $r:-Wl,-rpath-link,$2
 		gen $action $r:-Wl,-rpath,$2
 		gen $action $r:-Wl,-R$2
-		gen $action $r:-Wl,@_OPSYS_RPATH_NAME@$2
 		gen $action $r:-R$2
 		;;
 	S)
diff --git a/mk/compiler/gcc.mk b/mk/compiler/gcc.mk
index fa359e4c9e9..f9a44bf31dd 100644
--- a/mk/compiler/gcc.mk
+++ b/mk/compiler/gcc.mk
@@ -1,4 +1,4 @@
-# $NetBSD: gcc.mk,v 1.69 2004/07/06 22:49:18 wiz Exp $
+# $NetBSD: gcc.mk,v 1.70 2004/08/27 06:29:09 jlam Exp $
 
 .if !defined(COMPILER_GCC_MK)
 COMPILER_GCC_MK=	defined
@@ -244,6 +244,12 @@ _NEED_NEWER_GCC!=	\
 PKG_SKIP_REASON=	"Unable to satisfy dependency: ${_GCC_DEPENDS}"
 .endif
 
+# GNU ld option used to set the rpath
+_LINKER_RPATH_FLAG=	-R
+
+# GCC passes rpath directives to the linker using "-Wl,-R".
+_COMPILER_RPATH_FLAG=	-Wl,${_LINKER_RPATH_FLAG}
+
 .if !empty(_USE_PKGSRC_GCC:M[yY][eE][sS])
 #
 # Ensure that the correct rpath is passed to the linker if we need to
@@ -287,7 +293,7 @@ _GCC_SUBPREFIX:=	${_GCC_ARCHDIR:H:H:H:H:T}/
 _GCC_LIBDIRS=	${_GCC_ARCHDIR} ${_GCC_PREFIX}lib
 _GCC_LDFLAGS=	# empty
 .  for _dir_ in ${_GCC_LIBDIRS:N*not_found*}
-_GCC_LDFLAGS+=	-L${_dir_} ${_COMPILER_LD_FLAG}${RPATH_FLAG}${_dir_}
+_GCC_LDFLAGS+=	-L${_dir_} ${COMPILER_RPATH_FLAG}${_dir_}
 .  endfor
 LDFLAGS+=	${_GCC_LDFLAGS}
 .endif
@@ -329,9 +335,6 @@ FC=		${PKG_FC:T}
 F77=		${PKG_FC:T}
 .endif
 
-# GCC passes flags to the linker using "-Wl,".
-_COMPILER_LD_FLAG=	-Wl,
-
 # Pass the required flags to imake to tell it we're using gcc on Solaris.
 .if ${OPSYS} == "SunOS"
 IMAKEOPTS+=	-DHasGcc2=YES -DHasGcc2ForCplusplus=YES
diff --git a/mk/compiler/mipspro.mk b/mk/compiler/mipspro.mk
index ace179cbd15..4e0a92f910a 100644
--- a/mk/compiler/mipspro.mk
+++ b/mk/compiler/mipspro.mk
@@ -1,4 +1,4 @@
-# $NetBSD: mipspro.mk,v 1.24 2004/06/10 20:34:08 jschauma Exp $
+# $NetBSD: mipspro.mk,v 1.25 2004/08/27 06:29:09 jlam Exp $
 
 .if !defined(COMPILER_MIPSPRO_MK)
 COMPILER_MIPSPRO_MK=	defined
@@ -41,8 +41,11 @@ CC_VERSION_STRING?=	${CC_VERSION}
 CC_VERSION?=		MIPSpro Compilers
 .endif
 
-# MIPSPro passes flags to the linker using "-Wl,".
-_COMPILER_LD_FLAG=	-Wl,
+# MIPSPro linker option used to set the rpath.
+_LINKER_RPATH_FLAG=	-rpath
+
+# MIPSPro passes rpath directives to the linker using "-Wl,-rpath,".
+_COMPILER_RPATH_FLAG=	-Wl,${_LINKER_RPATH_FLAG},
 
 # Prepend the path to the compiler to the PATH.
 .if !empty(_LANGUAGES.mipspro)
diff --git a/mk/compiler/sunpro.mk b/mk/compiler/sunpro.mk
index e62ff6dcc83..ba67f68fab2 100644
--- a/mk/compiler/sunpro.mk
+++ b/mk/compiler/sunpro.mk
@@ -1,4 +1,4 @@
-# $NetBSD: sunpro.mk,v 1.20 2004/02/18 13:32:38 jlam Exp $
+# $NetBSD: sunpro.mk,v 1.21 2004/08/27 06:29:09 jlam Exp $
 
 .if !defined(COMPILER_SUNPRO_MK)
 COMPILER_SUNPRO_MK=	defined
@@ -32,7 +32,11 @@ PKG_CXX=	${_SUNPRO_CXX}
 CXX=		${PKG_CXX:T}
 .endif
 
-_COMPILER_LD_FLAG=	# empty
+# SunPro passes rpath directives to the linker using "-R".
+_LINKER_RPATH_FLAG=	-R
+
+# SunPro passes rpath directives to the linker using "-R".
+_COMPILER_RPATH_FLAG=	-R
 
 .if exists(${SUNWSPROBASE}/bin/cc)
 CC_VERSION_STRING!=	${SUNWSPROBASE}/bin/cc -V 2>&1 || ${TRUE}
diff --git a/mk/defs.AIX.mk b/mk/defs.AIX.mk
index 9be9822bc76..15d00437fdf 100644
--- a/mk/defs.AIX.mk
+++ b/mk/defs.AIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.AIX.mk,v 1.11 2004/06/18 11:22:41 kristerw Exp $
+# $NetBSD: defs.AIX.mk,v 1.12 2004/08/27 06:29:09 jlam Exp $
 #
 # Variable definitions for the AIX operating system.
 
@@ -155,7 +155,6 @@ _OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	no	# libossaudio is available
 _OPSYS_PERL_REQD=		# no base version of perl required
 _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
-_OPSYS_RPATH_NAME=	-R	# name of symbol in rpath directive to linker 
 _OPSYS_SHLIB_TYPE=	aixlib	# type of shared lib
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-b -V simple -z 	# switch to patch(1) for backup suffix
diff --git a/mk/defs.BSDOS.mk b/mk/defs.BSDOS.mk
index 1e7240c6166..ad0f7121844 100644
--- a/mk/defs.BSDOS.mk
+++ b/mk/defs.BSDOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.BSDOS.mk,v 1.11 2004/06/18 11:22:41 kristerw Exp $
+# $NetBSD: defs.BSDOS.mk,v 1.12 2004/08/27 06:29:09 jlam Exp $
 #
 # Variable definitions for the BSD/OS operating system.
 
@@ -141,7 +141,6 @@ _OPSYS_HAS_OSSAUDIO=	yes	# libossaudio is available
 _OPSYS_LIBTOOL_REQD=	1.4.20010614nb18 # base version of libtool required
 _OPSYS_PERL_REQD=		# no base version of perl required
 _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
-_OPSYS_RPATH_NAME=	-R	# name of symbol in rpath directive to linker 
 _OPSYS_SHLIB_TYPE=	ELF/a.out	# shared lib type
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -b -z	# switch to patch(1) for backup suffix
diff --git a/mk/defs.Darwin.mk b/mk/defs.Darwin.mk
index 890204f56a1..b31534bc031 100644
--- a/mk/defs.Darwin.mk
+++ b/mk/defs.Darwin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Darwin.mk,v 1.79 2004/08/14 19:35:39 schmonz Exp $
+# $NetBSD: defs.Darwin.mk,v 1.80 2004/08/27 06:29:09 jlam Exp $
 #
 # Variable definitions for the Darwin operating system.
 
@@ -131,7 +131,8 @@ _OPSYS_HAS_OSSAUDIO=	no	# libossaudio is available
 _OPSYS_LIBTOOL_REQD=	1.5.2nb5 # base version of libtool required
 _OPSYS_PERL_REQD=	5.8.0	# base version of perl required
 _OPSYS_PTHREAD_AUTO=	yes	# -lpthread not needed for pthreads
-_OPSYS_RPATH_NAME=	-L	# darwin has no rpath, use -L instead
+_OPSYS_LINKER_RPATH_FLAG=	-L	# darwin has no rpath, use -L instead
+_OPSYS_COMPILER_RPATH_FLAG=	-L	# compiler flag to pass rpaths to linker
 _OPSYS_SHLIB_TYPE=	dylib	# shared lib type
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -b -z	# switch to patch(1) for backup suffix
diff --git a/mk/defs.FreeBSD.mk b/mk/defs.FreeBSD.mk
index 7823f274323..ffedd8f9687 100644
--- a/mk/defs.FreeBSD.mk
+++ b/mk/defs.FreeBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.FreeBSD.mk,v 1.42 2004/06/18 11:22:41 kristerw Exp $
+# $NetBSD: defs.FreeBSD.mk,v 1.43 2004/08/27 06:29:09 jlam Exp $
 #
 # Variable definitions for the FreeBSD operating system.
 
@@ -141,7 +141,6 @@ _OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	yes	# libossaudio is available
 _OPSYS_PERL_REQD=		# no base version of perl required
 _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
-_OPSYS_RPATH_NAME=	-R	# name of symbol in rpath directive to linker 
 _OPSYS_SHLIB_TYPE=	ELF/a.out	# shared lib type
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -b 	# switch to patch(1) for backup suffix
diff --git a/mk/defs.IRIX.mk b/mk/defs.IRIX.mk
index 7832b288d31..5884aba5e73 100644
--- a/mk/defs.IRIX.mk
+++ b/mk/defs.IRIX.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.IRIX.mk,v 1.55 2004/08/26 00:41:45 jschauma Exp $
+# $NetBSD: defs.IRIX.mk,v 1.56 2004/08/27 06:29:09 jlam Exp $
 #
 # Variable definitions for the IRIX operating system.
 
@@ -132,7 +132,6 @@ _OPSYS_LIBTOOL_REQD=	1.4.20010614nb14 # base version of libtool required
 _OPSYS_NEEDS_XPKGWEDGE=	yes		# xpkgwedge is required for X11
 _OPSYS_PERL_REQD=			# no base version of perl required
 _OPSYS_PTHREAD_AUTO=	no		# -lpthread needed for pthreads
-_OPSYS_RPATH_NAME=	-rpath,		# name of symbol in rpath directive to linker 
 _OPSYS_SHLIB_TYPE=	ELF/a.out	# shared lib type
 .if defined(_OPSYS_GPATCH_REQD) && ${_OPSYS_GPATCH_REQD} == "YES"
 _PATCH_CAN_BACKUP=	yes		# patch(1) can make backups
diff --git a/mk/defs.Interix.mk b/mk/defs.Interix.mk
index 4853c3d0eb4..3f082bf1fe9 100644
--- a/mk/defs.Interix.mk
+++ b/mk/defs.Interix.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Interix.mk,v 1.26 2004/08/23 23:34:45 tv Exp $
+# $NetBSD: defs.Interix.mk,v 1.27 2004/08/27 06:29:09 jlam Exp $
 #
 # Variable definitions for the Interix operating system.
 
@@ -134,7 +134,6 @@ _OPSYS_LIBTOOL_REQD=	1.5.2nb7 # base version of libtool required
 _OPSYS_PERL_REQD=	5.8.3nb1 # base version of perl required
 _OPSYS_PKGTOOLS_REQD=	20040330
 _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
-_OPSYS_RPATH_NAME=	-R	# name of symbol in rpath directive to linker 
 _OPSYS_SHLIB_TYPE=	ELF	# shared lib type - not exactly true, but near enough
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-b -V simple -z	# switch to patch(1) for backup suffix
diff --git a/mk/defs.Linux.mk b/mk/defs.Linux.mk
index 2f3601e8af0..ea80b5ab3d9 100644
--- a/mk/defs.Linux.mk
+++ b/mk/defs.Linux.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.Linux.mk,v 1.74 2004/06/27 22:54:21 jschauma Exp $
+# $NetBSD: defs.Linux.mk,v 1.75 2004/08/27 06:29:09 jlam Exp $
 #
 # Variable definitions for the Linux operating system.
 
@@ -173,7 +173,6 @@ _OPSYS_HAS_MANZ=	no	# no MANZ for gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	no	# libossaudio is available
 _OPSYS_PERL_REQD=		# no base version of perl required
 _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
-_OPSYS_RPATH_NAME=	-R	# name of symbol in rpath directive to linker 
 _OPSYS_SHLIB_TYPE=	ELF/a.out	# shared lib type
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?= 	-b -V simple -z	# switch to patch(1) for backup suffix
diff --git a/mk/defs.NetBSD.mk b/mk/defs.NetBSD.mk
index 10bd9eb089a..36f31b94bfa 100644
--- a/mk/defs.NetBSD.mk
+++ b/mk/defs.NetBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.NetBSD.mk,v 1.68 2004/06/18 11:22:41 kristerw Exp $
+# $NetBSD: defs.NetBSD.mk,v 1.69 2004/08/27 06:29:09 jlam Exp $
 #
 # Variable definitions for the NetBSD operating system.
 
@@ -139,7 +139,6 @@ _OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	yes	# libossaudio is available
 _OPSYS_PERL_REQD=		# no base version of perl required
 _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
-_OPSYS_RPATH_NAME=	-R	# name of symbol in rpath directive to linker 
 _OPSYS_SHLIB_TYPE=	ELF/a.out	# shared lib type
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 _PATCH_BACKUP_ARG?=	-V simple -b 	# switch to patch(1) for backup suffix
diff --git a/mk/defs.OpenBSD.mk b/mk/defs.OpenBSD.mk
index 1079f4a0d26..88feea39312 100644
--- a/mk/defs.OpenBSD.mk
+++ b/mk/defs.OpenBSD.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.OpenBSD.mk,v 1.36 2004/07/21 21:50:41 xtraeme Exp $
+# $NetBSD: defs.OpenBSD.mk,v 1.37 2004/08/27 06:29:09 jlam Exp $
 #
 # Variable definitions for the OpenBSD operating system.
 
@@ -129,7 +129,6 @@ _OPSYS_HAS_MANZ=	yes	# MANZ controls gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	yes	# libossaudio is available
 _OPSYS_PERL_REQD=		# no base version of perl required
 _OPSYS_PTHREAD_AUTO=	no	# -lpthread needed for pthreads
-_OPSYS_RPATH_NAME=	-R	# name of symbol in rpath directive to linker 
 _OPSYS_SHLIB_TYPE=	ELF/a.out	# shared lib type
 _PATCH_CAN_BACKUP=	yes	# native patch(1) can make backups
 .if ${OS_VERSION} >= 3.4
diff --git a/mk/defs.SunOS.mk b/mk/defs.SunOS.mk
index d324e2d8cd7..1b45a2ddb28 100644
--- a/mk/defs.SunOS.mk
+++ b/mk/defs.SunOS.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.SunOS.mk,v 1.88 2004/07/03 22:04:57 grant Exp $
+# $NetBSD: defs.SunOS.mk,v 1.89 2004/08/27 06:29:09 jlam Exp $
 #
 # Variable definitions for the SunOS/Solaris operating system.
 
@@ -128,7 +128,6 @@ _OPSYS_HAS_MANZ=	no		# no MANZ for gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	no		# libossaudio is available
 _OPSYS_PERL_REQD=		# no base version of perl required
 _OPSYS_PTHREAD_AUTO=	no		# -lpthread needed for pthreads
-_OPSYS_RPATH_NAME=	-R		# name of symbol in rpath directive to linker 
 _OPSYS_SHLIB_TYPE=	ELF/a.out	# shared lib type
 _PATCH_CAN_BACKUP=	yes		# native patch(1) can make backups
 _PATCH_BACKUP_ARG?= 	-b -V simple -z	# switch to patch(1) for backup suffix
diff --git a/mk/defs.UnixWare.mk b/mk/defs.UnixWare.mk
index 9a822030d3e..281af759a3e 100644
--- a/mk/defs.UnixWare.mk
+++ b/mk/defs.UnixWare.mk
@@ -1,4 +1,4 @@
-# $NetBSD: defs.UnixWare.mk,v 1.6 2004/08/10 15:11:58 jlam Exp $
+# $NetBSD: defs.UnixWare.mk,v 1.7 2004/08/27 06:29:09 jlam Exp $
 #
 # Variable definitions for the UnixWare 7 operating system.
 
@@ -124,8 +124,6 @@ _OPSYS_HAS_MANZ=	no		# no MANZ for gzipping of man pages
 _OPSYS_HAS_OSSAUDIO=	no		# libossaudio is available
 _OPSYS_PERL_REQD=		# no base version of perl required
 _OPSYS_PTHREAD_AUTO=	no		# -lpthread needed for pthreads
-# XXX native linker for UnixWare doesn't have this, see also _USE_RPATH
-_OPSYS_RPATH_NAME=	-L		# name of symbol in rpath directive to linker
 _OPSYS_SHLIB_TYPE=	ELF/a.out	# shared lib type
 _PATCH_CAN_BACKUP=	yes		# native patch(1) can make backups
 _PATCH_BACKUP_ARG?= 	-b -V simple -z	# switch to patch(1) for backup suffix
diff --git a/mk/motif.buildlink3.mk b/mk/motif.buildlink3.mk
index 8959c7740bd..9e36b943953 100644
--- a/mk/motif.buildlink3.mk
+++ b/mk/motif.buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: motif.buildlink3.mk,v 1.4 2004/06/18 11:22:41 kristerw Exp $
+# $NetBSD: motif.buildlink3.mk,v 1.5 2004/08/27 06:29:09 jlam Exp $
 #
 # MOTIFBASE
 #	choose the Motif-2.0 installation at the named location.
@@ -84,8 +84,8 @@ MAKE_ENV+=		MOTIFLIB="${MOTIFLIB}"
 MAKE_ENV+=		MOTIFBASE="${_MOTIFBASE}"
 CPPFLAGS+=		-I${_MOTIFBASE}/include
 LDFLAGS+=		-L${_MOTIFBASE}/lib
-LDFLAGS+=		${_COMPILER_LD_FLAG}${_OPSYS_RPATH_NAME}${_MOTIFBASE}/lib
-MOTIFLIB?=		${_COMPILER_LD_FLAG}${_OPSYS_RPATH_NAME}${_MOTIFBASE}/lib \
+LDFLAGS+=		${COMPILER_RPATH_FLAG}${_MOTIFBASE}/lib
+MOTIFLIB?=		${COMPILER_RPATH_FLAG}${_MOTIFBASE}/lib \
 				-L${_MOTIFBASE}/lib -lXm -lXp
 
 .endif	# MOTIF_BUILDLINK3_MK