From ab4f5affb8afd37b8fe1f036871b58b7f59d8ec9 Mon Sep 17 00:00:00 2001
From: marcus <marcus@FreeBSD.org>
Date: Wed, 9 Oct 2002 16:14:57 +0000
Subject: Hack up some of the conditionals so that they work with older
 versions of make.

PR:	43813
---
 Mk/bsd.gnomeng.mk | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/Mk/bsd.gnomeng.mk b/Mk/bsd.gnomeng.mk
index 8c7ece4269dc..ba3aaa124479 100644
--- a/Mk/bsd.gnomeng.mk
+++ b/Mk/bsd.gnomeng.mk
@@ -224,19 +224,27 @@ libpanel_USE_GNOME_IMPL=gnomelibs
 
 _USE_GNOME_SAVED:=${USE_GNOME}
 HAVE_GNOME?=
-.if (defined(WANT_GNOME) && !defined(WITHOUT_GNOME)) || \
-  (defined(WITHOUT_GNOME) && ${WITHOUT_GNOME}!="yes" && \
-  ${WITHOUT_GNOME}!="1")
+.if (defined(WANT_GNOME) && !defined(WITHOUT_GNOME))
 . for component in ${_USE_GNOME_ALL}
-.  if !defined(WITHOUT_GNOME) || (defined(WITHOUT_GNOME) && \
-     ${WITHOUT_GNOME:M${component}}=="")
-.    if exists(${${component}_DETECT}) || (defined(WITH_GNOME) && \
-       (${WITH_GNOME}=="yes" || ${WITH_GNOME:M${component}}!="" || \
-       ${WITH_GNOME}=="1"))
+.    if exists(${${component}_DETECT})
 HAVE_GNOME+=	${component}
+.    elif defined(WITH_GNOME)
+.      if ${WITH_GNOME}=="yes" || ${WITH_GNOME:M${component}}!="" || \
+         ${WITH_GNOME}=="1"
+HAVE_GNOME+=	${component}
+.      endif
 .    endif
-.  endif
 . endfor
+.elif defined(WITHOUT_GNOME)
+.  if ${WITHOUT_GNOME}!="yes" && ${WITHOUT_GNOME}!="1"
+.    for component in ${_USE_GNOME_ALL}
+.      if ${WITHOUT_GNOME:M${component}}==""
+.        if exists(${${component}_DETECT})
+HAVE_GNOME+=	${component}
+.        endif
+.      endif
+.    endfor
+.  endif
 .endif
 
 .endif
-- 
cgit