[pkgsrc/trunk]: pkgsrc/mk/tools The make(1) of NetBSD 1.6.2 gets confused by ...

[rillig <rillig%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/36c06487157a
branches:  trunk
changeset: 503845:36c06487157a
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Thu Dec 01 09:24:09 2005 +0000

description:
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:

 mk/tools/replace.mk |  12 +++++++-----
 1 files changed, 7 insertions(+), 5 deletions(-)

diffs (31 lines):

diff -r e7a909fc9dbb -r 36c06487157a mk/tools/replace.mk
--- a/mk/tools/replace.mk       Thu Dec 01 09:03:00 2005 +0000
+++ b/mk/tools/replace.mk       Thu Dec 01 09:24:09 2005 +0000
@@ -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 @@
 # 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