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 | 2347df5518184e316028bf90a0d032ee71028b63 (patch) | |
| tree | 0ff3b0eccc04d1b065efd866b0590608098961d5 /math | |
| parent | e5a1b353192b781a2b5c36eca0f963c97d681caa (diff) | |
| download | pkgsrc-2347df5518184e316028bf90a0d032ee71028b63.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 'math')
| -rw-r--r-- | math/octave/Makefile | 4 | ||||
| -rw-r--r-- | math/scilab/Makefile | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/math/octave/Makefile b/math/octave/Makefile index 893eae1776e..eb410c5fe37 100644 --- a/math/octave/Makefile +++ b/math/octave/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.47 2004/04/27 21:26:08 snj Exp $ +# $NetBSD: Makefile,v 1.48 2004/08/27 06:29:08 jlam Exp $ # FreeBSD Id: Makefile,v 1.18 1998/09/27 20:10:45 steve Exp DISTNAME= octave-2.0.17 @@ -28,7 +28,7 @@ USE_LIBTOOL= yes USE_GNU_TOOLS+= make CONFIGURE_ENV+= FFLAGS="${CFLAGS}" OBJECT_FMT="${OBJECT_FMT}" CPPFLAGS+= -I${WRKDIR}/include -LDFLAGS+= -Wl,${RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib +LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib -L${PREFIX}/lib USE_MAKEINFO= YES INFO_FILES= liboctave.info octave.info diff --git a/math/scilab/Makefile b/math/scilab/Makefile index 8dc288c733d..7ab69465845 100644 --- a/math/scilab/Makefile +++ b/math/scilab/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.54 2004/07/15 04:00:46 dmcmahill Exp $ +# $NetBSD: Makefile,v 1.55 2004/08/27 06:29:08 jlam Exp $ # DISTNAME= ${SCIBASE}.src @@ -44,7 +44,7 @@ CONFIGURE_ENV+= PVM_ROOT=${PVM_ROOT} CONFIGURE_ENV+= X11BASE=${X11BASE} PLIST_SUBST+= SCIBASE=${SCIBASE} -UNBUILDLINK_FILES+= Makemex config/configuration config/Makeso.incl +UNWRAP_FILES+= Makemex config/configuration config/Makeso.incl BUILDLINK_DEPMETHOD.sablotron= build |