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/sqsh/Makefile.common | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'databases/sqsh') diff --git a/databases/sqsh/Makefile.common b/databases/sqsh/Makefile.common index 02748ccc8bf..a4ab5166eda 100644 --- a/databases/sqsh/Makefile.common +++ b/databases/sqsh/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.4 2004/07/18 09:38:26 schmonz Exp $ +# $NetBSD: Makefile.common,v 1.5 2004/08/27 06:29:07 jlam Exp $ DISTNAME= sqsh-2.1-src CATEGORIES= databases @@ -34,7 +34,7 @@ CONFIGURE_ENV+= SYBASE_LIBS=-lct MAKE_FLAGS+= SYBASE_LIBS=-lct .endif -LDFLAGS+= -Wl,${RPATH_FLAG}${_SYBASE}/lib +LDFLAGS+= ${COMPILER_RPATH_FLAG}${_SYBASE}/lib CONFIGURE_ENV+= SYBASE="${_SYBASE}" CONFIGURE_ENV+= INCDIRS="${BUILDLINK_PREFIX.readline}/include" CONFIGURE_ENV+= LIBDIRS="${BUILDLINK_PREFIX.readline}/lib" -- cgit v1.2.3