diff options
Diffstat (limited to 'math/octave-current')
-rw-r--r-- | math/octave-current/Makefile | 6 | ||||
-rw-r--r-- | math/octave-current/octave.mk | 15 |
2 files changed, 10 insertions, 11 deletions
diff --git a/math/octave-current/Makefile b/math/octave-current/Makefile index 1da62482d6d..9ecce2fa3c4 100644 --- a/math/octave-current/Makefile +++ b/math/octave-current/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.51 2005/07/09 18:39:30 kristerw Exp $ +# $NetBSD: Makefile,v 1.52 2005/12/05 20:50:36 rillig Exp $ DISTNAME= octave-${OCTAVE_VER} PKGNAME= octave-current-${OCTAVE_VER} @@ -30,7 +30,7 @@ USE_MAKEINFO= yes USE_TOOLS+= gmake perl GNU_CONFIGURE= yes -GCC_REQD= 3.0 +GCC_REQD+= 3.0 USE_LANGUAGES= c c++ fortran # needed for loading of shared objects such as those in the @@ -43,7 +43,7 @@ CONFIGURE_ARGS+= --disable-shared .include "options.mk" GNU_PLATFORM_DIR!= ${.CURDIR}/../../mk/gnu-config/config.sub ${MACHINE_GNU_PLATFORM} -PLIST_SUBST+= GNU_PLATFORM_DIR=${GNU_PLATFORM_DIR} +PLIST_SUBST+= GNU_PLATFORM_DIR=${GNU_PLATFORM_DIR:Q} INFO_FILES= octave.info liboctave.info LIBOCTAVE_INFO= liboctave.info liboctave.info-1 \ diff --git a/math/octave-current/octave.mk b/math/octave-current/octave.mk index 17a148ab85c..2e623babc5f 100644 --- a/math/octave-current/octave.mk +++ b/math/octave-current/octave.mk @@ -1,21 +1,20 @@ -# $NetBSD: octave.mk,v 1.3 2005/04/01 10:15:19 adam Exp $ +# $NetBSD: octave.mk,v 1.4 2005/12/05 20:50:37 rillig Exp $ .include "../../mk/bsd.prefs.mk" OCTAVE_CONFIG= ${LOCALBASE}/bin/octave-config # OCTAVE_VARS is a list of variables to define in the make environment. -# This may be overridden in an octave add-on package Makefile. +# This may be overridden in an octave add-on package Makefile. OCTAVE_VARS?= LOCALVERFCNFILEDIR LOCALVEROCTFILEDIR LOCALVERARCHLIBDIR VERSION # Set OCT_<var> to the value of <var> as returned by octave-config. .if !empty(PHASES_AFTER_EXTRACT:M${PKG_PHASE}) -. if exists(${OCTAVE_CONFIG}) +. if exists(${OCTAVE_CONFIG}) . for _var_ in ${OCTAVE_VARS} . if !defined(OCT_${_var_}) -OCT_${_var_}!= ${OCTAVE_CONFIG} -p ${_var_} -. endif +OCT_${_var_}!= ${OCTAVE_CONFIG} -p ${_var_} +. endif . endfor -. undef _var_ -. endif -.endif +. endif +.endif |