diff options
| author | jlam <jlam> | 2004-08-27 06:29:06 +0000 |
|---|---|---|
| committer | jlam <jlam> | 2004-08-27 06:29:06 +0000 |
| commit | 64c83961643743b2423afc56e568e2cb05963660 (patch) | |
| tree | 0ff3b0eccc04d1b065efd866b0590608098961d5 /mail/exim | |
| parent | b1d52ddb282f29c948118e6048aa57331cc442c0 (diff) | |
| download | pkgsrc-64c83961643743b2423afc56e568e2cb05963660.tar.gz | |
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.
Diffstat (limited to 'mail/exim')
| -rw-r--r-- | mail/exim/Makefile.common | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/mail/exim/Makefile.common b/mail/exim/Makefile.common index 51e41c76c88..5141e8ae3bb 100644 --- a/mail/exim/Makefile.common +++ b/mail/exim/Makefile.common @@ -1,4 +1,4 @@ -# $NetBSD: Makefile.common,v 1.13 2004/07/07 08:46:07 wiz Exp $ +# $NetBSD: Makefile.common,v 1.14 2004/08/27 06:29:08 jlam Exp $ MASTER_SITES= ftp://ftp.exim.org/pub/exim/exim4/ \ ftp://ftp.csx.cam.ac.uk/pub/software/email/exim/exim4/ \ @@ -41,19 +41,19 @@ CFLAGS+= ${_STRIPFLAG_CC} .if defined(EXIM_DB) && ${EXIM_DB} == "gdbm" . include "../../databases/gdbm/buildlink3.mk" EXIM_USE_DB_CONFIG= USE_GDBM=yes -EXIM_DBMLIB= DBMLIB=-Wl,${RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.gdbm} -lgdbm +EXIM_DBMLIB= DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.gdbm} -lgdbm EXIM_INCLUDE= -I${PREFIX}/include .else # use native or Berkeley DB as defined by BDB_DEFAULT and BDB_ACCEPTED . include "../../mk/bdb.buildlink3.mk" EXIM_USE_DB_CONFIG= USE_DB=yes # the default . if ${BDB_TYPE} == "db4" -EXIM_DBMLIB= DBMLIB=-Wl,${RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db4} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db4} -ldb4 +EXIM_DBMLIB= DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db4} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db4} -ldb4 EXIM_INCLUDE= -I${PREFIX}/${BUILDLINK_INCDIRS.db4} . elif ${BDB_TYPE} == "db3" -EXIM_DBMLIB= DBMLIB=-Wl,${RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db3} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db3} -ldb3 +EXIM_DBMLIB= DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db3} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db3} -ldb3 EXIM_INCLUDE= -I${PREFIX}/${BUILDLINK_INCDIRS.db3} . elif ${BDB_TYPE} == "db2" -EXIM_DBMLIB= DBMLIB=-Wl,${RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db2} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db2} -ldb2 +EXIM_DBMLIB= DBMLIB=${COMPILER_RPATH_FLAG}${LOCALBASE}/${BUILDLINK_LIBDIRS.db2} -L${LOCALBASE}/${BUILDLINK_LIBDIRS.db2} -ldb2 EXIM_INCLUDE= -I${PREFIX}/${BUILDLINK_INCDIRS.db2} . else # using native EXIM_DBMLIB= # empty so use defaults |