diff options
| author | rillig <rillig@pkgsrc.org> | 2005-12-01 09:24:09 +0000 |
|---|---|---|
| committer | rillig <rillig@pkgsrc.org> | 2005-12-01 09:24:09 +0000 |
| commit | 86d2fdd58a0caed48003c4b11ba6549a8ab0f179 (patch) | |
| tree | 8567114066b44b06e4aa2f6d7d32cb0a0ba435ce /mk/tools | |
| parent | 18b653a43b6fd0dba63fd19daabe79d52c2756b0 (diff) | |
| download | pkgsrc-86d2fdd58a0caed48003c4b11ba6549a8ab0f179.tar.gz | |
The make(1) of NetBSD 1.6.2 gets confused by complicated conditionals
involving undefined variables. Added a work-around by splitting up the
conditionals.
Fixes PR 32206.
Diffstat (limited to 'mk/tools')
| -rw-r--r-- | mk/tools/replace.mk | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/mk/tools/replace.mk b/mk/tools/replace.mk index 56b977fbbb1..3c7819a8df3 100644 --- a/mk/tools/replace.mk +++ b/mk/tools/replace.mk @@ -1,4 +1,4 @@ -# $NetBSD: replace.mk,v 1.137 2005/11/28 06:06:16 jlam Exp $ +# $NetBSD: replace.mk,v 1.138 2005/12/01 09:24:09 rillig Exp $ # # Copyright (c) 2005 The NetBSD Foundation, Inc. # All rights reserved. @@ -878,15 +878,17 @@ _TOOLS_DEP.ghostscript:= ${_TOOLS_DEP.ghostscript},ghostscript-nox11 # XXX backwards-compatibility. # . if defined(NO_X11) -. if (defined(PKG_OPTIONS) && !empty(PKG_OPTIONS:Mcups)) || \ - (defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS])) +. if (defined(PKG_OPTIONS) && !empty(PKG_OPTIONS:Mcups)) +_TOOLS_PKGSRCDIR.ghostscript= ../../print/ghostscript-esp +. elif (defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS])) _TOOLS_PKGSRCDIR.ghostscript= ../../print/ghostscript-esp . else _TOOLS_PKGSRCDIR.ghostscript= ../../print/ghostscript-gnu . endif . else -. if (defined(PKG_OPTIONS) && !empty(PKG_OPTIONS:Mcups)) || \ - (defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS])) +. if (defined(PKG_OPTIONS) && !empty(PKG_OPTIONS:Mcups)) +_TOOLS_PKGSRCDIR.ghostscript= ../../print/ghostscript-esp +. elif (defined(USE_CUPS) && !empty(USE_CUPS:M[yY][eE][sS])) _TOOLS_PKGSRCDIR.ghostscript= ../../print/ghostscript-esp . else _TOOLS_PKGSRCDIR.ghostscript= ../../print/ghostscript-gnu |