summaryrefslogtreecommitdiff
path: root/lang/cim
diff options
context:
space:
mode:
authorjlam <jlam>2004-08-27 06:29:06 +0000
committerjlam <jlam>2004-08-27 06:29:06 +0000
commit64c83961643743b2423afc56e568e2cb05963660 (patch)
tree0ff3b0eccc04d1b065efd866b0590608098961d5 /lang/cim
parentb1d52ddb282f29c948118e6048aa57331cc442c0 (diff)
downloadpkgsrc-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 'lang/cim')
-rw-r--r--lang/cim/Makefile4
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\"|"