diff options
| author | Michael Weghorn <m.weghorn@posteo.de> | 2020-03-27 09:36:14 +0100 |
|---|---|---|
| committer | Michael Weghorn <m.weghorn@posteo.de> | 2020-03-27 09:36:14 +0100 |
| commit | 1a9c8e1468399c99224c54c35ea25394650cfa3e (patch) | |
| tree | f5c37525463323628d8b4b6f8c14895eb57dce6a /solenv | |
| parent | 59ac7623101c6c728819291199d8683d49d5f95e (diff) | |
| parent | 9ad9c9b869d8ead906283ed363ce0067d5570e06 (diff) | |
Merge branch 'libreoffice-6-4'
into distro/lhm/libreoffice-6-4+backports
Change-Id: I586df286d337e2f6d7986e2d9cea8271d9e72f3d
Diffstat (limited to 'solenv')
| -rw-r--r-- | solenv/gbuild/platform/com_GCC_class.mk | 2 | ||||
| -rw-r--r-- | solenv/gbuild/platform/com_MSC_class.mk | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/solenv/gbuild/platform/com_GCC_class.mk b/solenv/gbuild/platform/com_GCC_class.mk index 25142f70625c..d5dcb8e345c1 100644 --- a/solenv/gbuild/platform/com_GCC_class.mk +++ b/solenv/gbuild/platform/com_GCC_class.mk @@ -194,7 +194,7 @@ endef define gb_UIConfig__gla11y_command $(call gb_Helper_abbreviate_dirs,\ - $(gb_UIConfig_LXML_PATH) $(gb_Helper_set_ld_path) \ + $(gb_UIConfig_LXML_PATH) $(if $(SYSTEM_LIBXML)$(SYSTEM_LIBXSLT),,$(gb_Helper_set_ld_path)) \ $(call gb_ExternalExecutable_get_command,python) \ $(gb_UIConfig_gla11y_SCRIPT) $(gb_UIConfig_gla11y_PARAMETERS) -o $@ $(UIFILES) ) diff --git a/solenv/gbuild/platform/com_MSC_class.mk b/solenv/gbuild/platform/com_MSC_class.mk index 3c41c945a559..143847fb66f4 100644 --- a/solenv/gbuild/platform/com_MSC_class.mk +++ b/solenv/gbuild/platform/com_MSC_class.mk @@ -644,7 +644,7 @@ define gb_UIConfig__gla11y_command $(call gb_ExternalExecutale__check_registration,python) $(call gb_Helper_abbreviate_dirs,\ FILES=$(call var2file,$(shell $(gb_MKTEMP)),100,$(UIFILES)) && \ - $(gb_UIConfig_LXML_PATH) $(gb_Helper_set_ld_path) \ + $(gb_UIConfig_LXML_PATH) $(if $(SYSTEM_LIBXML)$(SYSTEM_LIBXSLT),,$(gb_Helper_set_ld_path)) \ $(call gb_ExternalExecutable_get_command,python) \ $(gb_UIConfig_gla11y_SCRIPT) $(gb_UIConfig_gla11y_PARAMETERS) -o $@ -L $$FILES ) |