diff options
author | Michael Warner <michael.warner.ut+libreoffice@gmail.com> | 2021-05-11 09:22:27 -0400 |
---|---|---|
committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-06-23 13:08:29 +0200 |
commit | 98be6ca36a6e509303b69514d85471032d0dffce (patch) | |
tree | 43fea67b11b98518dd952ed7e85e7d776427bb3b /RepositoryExternal.mk | |
parent | 744e964619b5c49870ceab7f59daf1272f24cf75 (diff) |
tdf#141709: Use poppler_data
Bundle the files from poppler_data and provide the path to them to
poppler when the bundled poppler library is used.
Change-Id: I13a2ef861303a0be17aa0a861ef8ac96ed8a93be
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117523
Tested-by: Jenkins
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
(cherry picked from commit 648e4106cc002ff5b8184a8c104f93cb06e4b540)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/117714
Diffstat (limited to 'RepositoryExternal.mk')
-rw-r--r-- | RepositoryExternal.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 36c74ee95985..e79c9393828b 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -2808,7 +2808,7 @@ else # !SYSTEM_POPPLER define gb_LinkTarget__use_poppler $(call gb_LinkTarget_use_external_project,$(1),poppler,full) - +$(call gb_LinkTarget_use_package,$(1),poppler_data) $(call gb_LinkTarget_set_include,$(1),\ -I$(call gb_UnpackedTarball_get_dir,poppler) \ -I$(call gb_UnpackedTarball_get_dir,poppler)/poppler \ |