From 05b02ddc481875c5f5501ea3e84b6cf90487f363 Mon Sep 17 00:00:00 2001 From: kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> Date: Wed, 13 Nov 2013 16:32:19 +0000 Subject: Fix logic with fmake. git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18889 df743ca5-7f9a-e211-a948-0013205c9059 --- Mk/bsd.gnome.mk | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'Mk') diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk index 2c4de4b70..ee9137609 100644 --- a/Mk/bsd.gnome.mk +++ b/Mk/bsd.gnome.mk @@ -784,12 +784,19 @@ USE_CSTD= gnu89 # exist in ${_USE_GNOME} and set variables accordingly .ifdef _USE_GNOME -. if ${USE_GNOME:Mltasneededhack}!= "" || (${USE_GNOME:Mltverhack*}!= "" && \ - defined(USE_AUTOTOOLS) && ${USE_AUTOTOOLS:Mlibtool*}) +. if ${USE_GNOME:Mltasneededhack}!= "" GNOME_PRE_PATCH+= ${lthacks_PRE_PATCH} CONFIGURE_ENV+= ${lthacks_CONFIGURE_ENV} . endif +# this is splitted out from the above entry because fmake is trows a fit otherwise +. if defined(USE_AUTOTOOLS) && ${USE_AUTOTOOLS:Mlibtool*} +. if ${USE_GNOME:Mltverhack*}!= "" +GNOME_PRE_PATCH+= ${lthacks_PRE_PATCH} +CONFIGURE_ENV+= ${lthacks_CONFIGURE_ENV} +. endif +. endif + . for component in ${_USE_GNOME:O:u} . if defined(${component}_PATCH_DEPENDS) PATCH_DEPENDS+= ${${component}_PATCH_DEPENDS} -- cgit v1.2.3