aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormarcus <marcus@FreeBSD.org>2002-10-10 00:14:57 +0800
committermarcus <marcus@FreeBSD.org>2002-10-10 00:14:57 +0800
commitab4f5affb8afd37b8fe1f036871b58b7f59d8ec9 (patch)
tree6d8da011a61ebe0b87fe2a58a753ca358bf851f4
parentd38e5ce8c547ae975bf992fcdd4e5187125e7768 (diff)
downloadfreebsd-ports-gnome-ab4f5affb8afd37b8fe1f036871b58b7f59d8ec9.tar.gz
freebsd-ports-gnome-ab4f5affb8afd37b8fe1f036871b58b7f59d8ec9.tar.zst
freebsd-ports-gnome-ab4f5affb8afd37b8fe1f036871b58b7f59d8ec9.zip
Hack up some of the conditionals so that they work with older versions of
make. PR: 43813
-rw-r--r--Mk/bsd.gnomeng.mk26
1 files 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