summaryrefslogtreecommitdiffstats
path: root/Mk
diff options
context:
space:
mode:
authorkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-11-14 04:05:10 +0800
committerkwm <kwm@df743ca5-7f9a-e211-a948-0013205c9059>2013-11-14 04:05:10 +0800
commitb6fc8ea080e788f14705f12f0431586ff1a48abb (patch)
tree12b2d295f44762c4aa5abe1a50d22d8a8cf72ff0 /Mk
parent05b02ddc481875c5f5501ea3e84b6cf90487f363 (diff)
downloadmarcuscom-ports-b6fc8ea080e788f14705f12f0431586ff1a48abb.tar
marcuscom-ports-b6fc8ea080e788f14705f12f0431586ff1a48abb.tar.gz
marcuscom-ports-b6fc8ea080e788f14705f12f0431586ff1a48abb.tar.bz2
marcuscom-ports-b6fc8ea080e788f14705f12f0431586ff1a48abb.tar.lz
marcuscom-ports-b6fc8ea080e788f14705f12f0431586ff1a48abb.tar.xz
marcuscom-ports-b6fc8ea080e788f14705f12f0431586ff1a48abb.tar.zst
marcuscom-ports-b6fc8ea080e788f14705f12f0431586ff1a48abb.zip
Make sure we don't set lthacks_* twice.
git-svn-id: svn://creme-brulee.marcuscom.com/ports/trunk@18890 df743ca5-7f9a-e211-a948-0013205c9059
Diffstat (limited to 'Mk')
-rw-r--r--Mk/bsd.gnome.mk11
1 files changed, 7 insertions, 4 deletions
diff --git a/Mk/bsd.gnome.mk b/Mk/bsd.gnome.mk
index ee9137609..682179010 100644
--- a/Mk/bsd.gnome.mk
+++ b/Mk/bsd.gnome.mk
@@ -785,18 +785,21 @@ USE_CSTD= gnu89
.ifdef _USE_GNOME
. if ${USE_GNOME:Mltasneededhack}!= ""
-GNOME_PRE_PATCH+= ${lthacks_PRE_PATCH}
-CONFIGURE_ENV+= ${lthacks_CONFIGURE_ENV}
+_GNOME_NEED_LIBTOOL=1
. 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}
+_GNOME_NEED_LIBTOOL=1
. endif
. endif
+.if defined(_GNOME_NEED_LIBTOOL)
+GNOME_PRE_PATCH+= ${lthacks_PRE_PATCH}
+CONFIGURE_ENV+= ${lthacks_CONFIGURE_ENV}
+.endif
+
. for component in ${_USE_GNOME:O:u}
. if defined(${component}_PATCH_DEPENDS)
PATCH_DEPENDS+= ${${component}_PATCH_DEPENDS}