diff options
| author | Michael Stahl <mstahl@redhat.com> | 2017-09-14 14:54:07 +0200 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2017-09-15 11:03:05 +0200 |
| commit | 84b0f0631574832c5939cc63456fd1322e67339f (patch) | |
| tree | 6f280d08f6eb125b0efb113c509dbadd91684f29 /RepositoryExternal.mk | |
| parent | consistent naming of externals: png -> libpng (diff) | |
| download | core-84b0f0631574832c5939cc63456fd1322e67339f.tar.gz core-84b0f0631574832c5939cc63456fd1322e67339f.zip | |
consistent naming of externals: xml2 -> libxml2
Change-Id: Ia1164c70d02dce70cb346c1fd4033f12d91c6e5d
Reviewed-on: https://gerrit.libreoffice.org/42297
Reviewed-by: Michael Stahl <mstahl@redhat.com>
Tested-by: Michael Stahl <mstahl@redhat.com>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 22dcc802aeaa..4b90a1e2d979 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -822,11 +822,11 @@ gb_ExternalProject__use_libxml2:= else # !SYSTEM_LIBXML $(eval $(call gb_Helper_register_packages_for_install,ure,\ - xml2 \ + libxml2 \ )) define gb_LinkTarget__use_libxml2 -$(call gb_LinkTarget_use_package,$(1),xml2) +$(call gb_LinkTarget_use_package,$(1),libxml2) $(call gb_LinkTarget_set_include,$(1),\ $$(INCLUDE) \ $(LIBXML_CFLAGS) \ @@ -842,7 +842,7 @@ endif endef define gb_ExternalProject__use_libxml2 -$(call gb_ExternalProject_use_package,$(1),xml2) +$(call gb_ExternalProject_use_package,$(1),libxml2) ifeq ($(COM),MSC) $(call gb_ExternalProject_use_external_project,$(1),icu) @@ -3908,10 +3908,10 @@ gb_ExternalExecutable__register_xmllint := else # ! SYSTEM_LIBXML_FOR_BUILD define gb_ExternalExecutable__register_xmllint -$(call gb_ExternalExecutable_set_internal,xmllint,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xml2/$(if $(filter MSC,$(COM)),win32/bin.msvc)/xmllint$(gb_Executable_EXT_for_build),xml2) +$(call gb_ExternalExecutable_set_internal,xmllint,$(WORKDIR_FOR_BUILD)/UnpackedTarball/libxml2/$(if $(filter MSC,$(COM)),win32/bin.msvc)/xmllint$(gb_Executable_EXT_for_build),libxml2) $(call gb_ExternalExecutable_add_dependencies,xmllint,\ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,icu_ure)) \ - $(call gb_Package_get_target,xml2) \ + $(call gb_Package_get_target,libxml2) \ ) endef @@ -3928,7 +3928,7 @@ define gb_ExternalExecutable__register_xsltproc $(call gb_ExternalExecutable_set_internal,xsltproc,$(WORKDIR_FOR_BUILD)/UnpackedTarball/xslt/$(if $(filter MSC,$(COM)),win32/bin.msvc,xsltproc)/xsltproc$(gb_Executable_EXT_for_build),xslt) $(call gb_ExternalExecutable_add_dependencies,xsltproc,\ $(if $(filter WNT,$(OS)),$(call gb_Package_get_target,icu_ure)) \ - $(call gb_Package_get_target,xml2) \ + $(call gb_Package_get_target,libxml2) \ $(call gb_Package_get_target,xslt) \ ) |