solenv/gbuild/AllLangResTarget.mk | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 94c50851dde2c0750d589f92448e87d5f61689d7
Author: David Tardon <dtar...@redhat.com>
Date: Thu Nov 15 16:07:39 2012 +0100
use gb_WITH_LANG consistently
Change-Id: I50f5b8c95d82781029f3ae3dda1865dea9b336d5
diff --git a/solenv/gbuild/AllLangResTarget.mk
b/solenv/gbuild/AllLangResTarget.mk
index 7247b18..477ec83 100644
--- a/solenv/gbuild/AllLangResTarget.mk
+++ b/solenv/gbuild/AllLangResTarget.mk
@@ -132,7 +132,7 @@ $(call gb_SrsTemplatePartTarget_get_target,$(1)) : $(call
gb_SrsPartMergeTarget_
$$(call gb_Helper_abbreviate_dirs,\
mkdir -p $$(dir $$@) && \
cp $$< $$@)
-ifneq ($(strip $(WITH_LANG)),)
+ifneq ($(strip $(gb_WITH_LANG)),)
$(call gb_SrsPartMergeTarget_SrsPartMergeTarget,$(1),$(true))
endif
@@ -165,13 +165,13 @@ endef
# How it works:
# We let _get_target depend on _get_update_target, so after they are
# done, _get_target is newer than _get_update_target. If
-# WITH_LANG changes (from nonempty to empty or the other way around),
+# gb_WITH_LANG changes (from nonempty to empty or the other way around),
# _get_target and _get_update_target are switched, therefore _get_target
# is now _older_ than _get_update_target and must be regenerated :-)
gb_SrsTemplateTarget__get_merged_target = $(call
gb_SrsTemplateTarget_get_target,$(1))_merged_last
gb_SrsTemplateTarget__get_unmerged_target = $(call
gb_SrsTemplateTarget_get_target,$(1))_unmerged_last
-ifeq ($(strip $(WITH_LANG)),)
+ifeq ($(strip $(gb_WITH_LANG)),)
gb_SrsTemplateTarget__get_target = $(call
gb_SrsTemplateTarget__get_unmerged_target,$(1))
gb_SrsTemplateTarget__get_update_target = $(call
gb_SrsTemplateTarget__get_merged_target,$(1))
else
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
