diff options
| author | jlam <jlam@pkgsrc.org> | 2004-08-27 06:29:06 +0000 |
|---|---|---|
| committer | jlam <jlam@pkgsrc.org> | 2004-08-27 06:29:06 +0000 |
| commit | ca7093842870728d22dde1258798b1704c53ca18 (patch) | |
| tree | 0ff3b0eccc04d1b065efd866b0590608098961d5 /lang/cim | |
| parent | 49f0d0312d389247bf08d1e7c28970e1dfb7508f (diff) | |
| download | pkgsrc-ca7093842870728d22dde1258798b1704c53ca18.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 'lang/cim')
| -rw-r--r-- | lang/cim/Makefile | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lang/cim/Makefile b/lang/cim/Makefile index af3df13d770..d026a87fb23 100644 --- a/lang/cim/Makefile +++ b/lang/cim/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.17 2004/05/11 03:33:57 snj Exp $ +# $NetBSD: Makefile,v 1.18 2004/08/27 06:29:08 jlam Exp $ DISTNAME= cim-3.30 CATEGORIES= lang @@ -20,7 +20,7 @@ SUBST_STAGE.x= post-patch SUBST_FILES.x= src/cimcomp.c SUBST_SED.x= -e "s|SCC|\"${CC}\"|" SUBST_SED.x+= -e "s|SCFLAGS|\"${CFLAGS} -I${PREFIX}/include\"|" -SUBST_SED.x+= -e "s|SLDFLAGS|\"-L${PREFIX}/lib -Wl,${RPATH_FLAG}${PREFIX}/lib\"|" +SUBST_SED.x+= -e "s|SLDFLAGS|\"-L${PREFIX}/lib ${COMPILER_RPATH_FLAG}${PREFIX}/lib\"|" SUBST_SED.x+= -e "s|= LIBDIR|= \"${PREFIX}/lib\"|" SUBST_SED.x+= -e "s|= INCLUDEDIR|= \"${PREFIX}/include\"|" |