From c67635060cd54b4f914d016d2d93bdcc9c66c834 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. --- databases/mysql-client/Makefile.common | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'databases/mysql-client') diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common index 4e344f375f7..e5bb0fa931c 100644 --- a/databases/mysql-client/Makefile.common +++ b/databases/mysql-client/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.24 2004/07/20 04:53:09 xtraeme Exp $ +# $NetBSD: Makefile.common,v 1.25 2004/08/27 06:29:07 jlam Exp $ DISTNAME= mysql-3.23.58 CATEGORIES= databases @@ -60,7 +60,7 @@ CXXFLAGS+= -DHAVE_CURSES_H USE_PERL5= # defined USE_LIBTOOL= # defined -LDFLAGS+= -Wl,${RPATH_FLAG}${LOCALBASE}/lib/mysql +LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql post-extract: cd ${WRKSRC}; \ -- cgit v1.2.3