diff options
| author | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-11-14 00:32:19 +0800 |
|---|---|---|
| committer | kwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059> | 2013-11-14 00:32:19 +0800 |
| commit | 05b02ddc481875c5f5501ea3e84b6cf90487f363 (patch) | |
| tree | a8e1fa4e68428630358727e6fa7efc058c47d4e7 | |
| parent | 5e340f9e49fbd2e7eff50572fd26371ca14b1173 (diff) | |
| download | marcuscom-ports-05b02ddc481875c5f5501ea3e84b6cf90487f363.tar marcuscom-ports-05b02ddc481875c5f5501ea3e84b6cf90487f363.tar.gz marcuscom-ports-05b02ddc481875c5f5501ea3e84b6cf90487f363.tar.bz2 marcuscom-ports-05b02ddc481875c5f5501ea3e84b6cf90487f363.tar.lz marcuscom-ports-05b02ddc481875c5f5501ea3e84b6cf90487f363.tar.xz marcuscom-ports-05b02ddc481875c5f5501ea3e84b6cf90487f363.tar.zst marcuscom-ports-05b02ddc481875c5f5501ea3e84b6cf90487f363.zip | |
Fix logic with fmake.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18889 df743ca5-7f9a-e211-a948-0013205c9059
| -rw-r--r-- | Mk/bsd.gnome.mk | 11 |
1 files changed, 9 insertions, 2 deletions
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} |