diff options
| author | tnn <tnn> | 2008-02-13 18:33:39 +0000 |
|---|---|---|
| committer | tnn <tnn> | 2008-02-13 18:33:39 +0000 |
| commit | 2ea75b2b063c2c577d207f22a92f98c4e3a4e3a1 (patch) | |
| tree | 61511dcfe87555ff6aff6663c3f737a4dc8b8379 /mk/tools | |
| parent | 57864009cedf054594d9fb913a2dac8e33539d33 (diff) | |
| download | pkgsrc-2ea75b2b063c2c577d207f22a92f98c4e3a4e3a1.tar.gz | |
Fix a recently introduced logic error. PR pkg/37998 from Stuart Shelton.
Diffstat (limited to 'mk/tools')
| -rw-r--r-- | mk/tools/replace.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index fa774415287..3dd5231df82 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.207 2008/02/07 17:01:02 tnn Exp $ +# $NetBSD: replace.mk,v 1.208 2008/02/13 18:33:39 tnn Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -895,20 +895,20 @@ _TOOLS.groff= groff nroff soelim tbl . if !defined(TOOLS_IGNORE.${_t_}) && !empty(_USE_TOOLS:M${_t_}) . if !empty(PKGPATH:Mtextproc/groff) MAKEFLAGS+= TOOLS_IGNORE.${_t_}= -. elif !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) || \ - (defined(_TOOLS_USE_PKGSRC.groff) && \ - !empty(_TOOLS_USE_PKGSRC.groff:M[yY][eE][sS])) +. else . if defined(_TOOLS_USE_PKGSRC.groff) && \ !empty(_TOOLS_USE_PKGSRC.groff:M[yY][eE][sS]) _TOOLS_USE_PKGSRC.${_t_}= yes . endif +. if !empty(_TOOLS_USE_PKGSRC.${_t_}:M[yY][eE][sS]) TOOLS_DEPENDS.${_t_}?= groff>=1.19.2nb3:../../textproc/groff TOOLS_CREATE+= ${_t_} TOOLS_FIND_PREFIX+= TOOLS_PREFIX.${_t_}=groff -. if ${OPSYS} == "SunOS" && "${_t_}" != "groff" +. if ${OPSYS} == "SunOS" && "${_t_}" != "groff" TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/g${_t_} -. else +. else TOOLS_PATH.${_t_}= ${TOOLS_PREFIX.${_t_}}/bin/${_t_} +. endif . endif . endif . endif |