diff options
| author | tv <tv> | 2005-01-13 20:19:57 +0000 |
|---|---|---|
| committer | tv <tv> | 2005-01-13 20:19:57 +0000 |
| commit | 82c870290306abed0c6f60ca1e53be1c5697914b (patch) | |
| tree | 58b499ef53f3817dccd65d679ed0614cdca4524e /mk | |
| parent | 3d39a8a95be16172c44bd8d572b623d663e98105 (diff) | |
| download | pkgsrc-82c870290306abed0c6f60ca1e53be1c5697914b.tar.gz | |
Put back the proper variable construct for LIBTOOL_REQD that was borken in
previous. (_OPSYS_LIBTOOL_REQD is only defined on some platforms, so the
:U clause provides the next best choice if that's not defined.)
Diffstat (limited to 'mk')
| -rw-r--r-- | mk/bsd.pkg.mk | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/mk/bsd.pkg.mk b/mk/bsd.pkg.mk index ccc1ec26c69..fd259dc2ba0 100644 --- a/mk/bsd.pkg.mk +++ b/mk/bsd.pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.pkg.mk,v 1.1557 2005/01/12 15:32:01 jlam Exp $ +# $NetBSD: bsd.pkg.mk,v 1.1558 2005/01/13 20:19:57 tv Exp $ # # This file is in the public domain. # @@ -381,11 +381,9 @@ SHLIBTOOL?= ${PKG_SHLIBTOOL} .if defined(USE_LIBTOOL) . if defined(USE_LANGUAGES) && !empty(USE_LANGUAGES:Mfortran) LIBTOOL_REQD?= 1.5.10nb7 -BUILD_DEPENDS+= libtool-base>=${LIBTOOL_REQD}:../../devel/libtool-base -. else -LIBTOOL_REQD?= 1.5.10nb1 -BUILD_DEPENDS+= libtool-base>=${_OPSYS_LIBTOOL_REQD}:../../devel/libtool-base . endif +LIBTOOL_REQD?= 1.5.10nb1 +BUILD_DEPENDS+= libtool-base>=${_OPSYS_LIBTOOL_REQD:U${LIBTOOL_REQD}}:../../devel/libtool-base CONFIGURE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" MAKE_ENV+= LIBTOOL="${LIBTOOL} ${LIBTOOL_FLAGS}" LIBTOOL_OVERRIDE?= libtool */libtool */*/libtool |