From 64c83961643743b2423afc56e568e2cb05963660 Mon Sep 17 00:00:00 2001 From: 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} ", 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. --- net/waste/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'net/waste/Makefile') diff --git a/net/waste/Makefile b/net/waste/Makefile index c207926812b..c372f7bdce6 100644 --- a/net/waste/Makefile +++ b/net/waste/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.7 2004/04/18 07:21:49 snj Exp $ +# $NetBSD: Makefile,v 1.8 2004/08/27 06:29:09 jlam Exp $ # DISTNAME= waste-source @@ -26,7 +26,7 @@ NO_BIN_ON_CDROM= ${RESTRICTED} USE_BUILDLINK3= yes -MAKE_ENV+= LDFLAGS="-L${BUILDLINK_PREFIX.pthread}/lib -Wl,${RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib" +MAKE_ENV+= LDFLAGS="-L${BUILDLINK_PREFIX.pthread}/lib ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.pthread}/lib" do-install: ${INSTALL_PROGRAM} ${WRKSRC}/wastesrv ${PREFIX}/sbin/wastesrv -- cgit v1.2.3