diff options
| author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-10-09 16:14:57 +0000 |
|---|---|---|
| committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2002-10-09 16:14:57 +0000 |
| commit | 5b4499e1380e66b4238e4e8681907af04161d775 (patch) | |
| tree | edb73711f00e2a606f856f6cfc2b2b4e875659d0 /Mk | |
| parent | Fix a bug in the DTD validation code that caused a seg fault due to freeing (diff) | |
Hack up some of the conditionals so that they work with older versions of
make.
PR: 43813
Notes
Notes:
svn path=/head/; revision=67699
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.gnomeng.mk | 26 |
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 |