external/clucene/Library_clucene.mk | 8 ++++----
external/epoxy/Library_epoxy.mk | 4 ++--
external/pdfium/Library_pdfium.mk | 8 ++++----
external/redland/Library_rasqal.mk | 6 +++---
4 files changed, 13 insertions(+), 13 deletions(-)
New commits:
commit fff7097f1ed8493de099d79aa0613ea6b309100a
Author: Stephan Bergmann <sberg...@redhat.com>
Date: Thu Nov 2 13:07:34 2017 +0100
Use gb_UnpackedTarball_get_dir
Change-Id: I931f0d95cad0a63d344c84d89ba7c80f14be8ec9
diff --git a/external/clucene/Library_clucene.mk
b/external/clucene/Library_clucene.mk
index 763bcd7d0892..e0f04b6e2894 100644
--- a/external/clucene/Library_clucene.mk
+++ b/external/clucene/Library_clucene.mk
@@ -16,10 +16,10 @@ $(eval $(call gb_Library_use_unpacked,clucene,clucene))
$(eval $(call gb_Library_set_warnings_not_errors,clucene))
$(eval $(call gb_Library_set_include,clucene,\
- -I$(WORKDIR)/UnpackedTarball/clucene/inc/internal \
- -I$(WORKDIR)/UnpackedTarball/clucene/src/core \
- -I$(WORKDIR)/UnpackedTarball/clucene/src/contribs-lib \
- -I$(WORKDIR)/UnpackedTarball/clucene/src/shared \
+ -I$(call gb_UnpackedTarball_get_dir,clucene)/inc/internal \
+ -I$(call gb_UnpackedTarball_get_dir,clucene)/src/core \
+ -I$(call gb_UnpackedTarball_get_dir,clucene)/src/contribs-lib \
+ -I$(call gb_UnpackedTarball_get_dir,clucene)/src/shared \
$$(INCLUDE) \
))
diff --git a/external/epoxy/Library_epoxy.mk b/external/epoxy/Library_epoxy.mk
index 1b1d28b68d79..d27d8deec920 100644
--- a/external/epoxy/Library_epoxy.mk
+++ b/external/epoxy/Library_epoxy.mk
@@ -14,8 +14,8 @@ $(eval $(call gb_Library_use_unpacked,epoxy,epoxy))
$(eval $(call gb_Library_set_warnings_not_errors,epoxy))
$(eval $(call gb_Library_set_include,epoxy,\
- -I$(WORKDIR)/UnpackedTarball/epoxy/include \
- -I$(WORKDIR)/UnpackedTarball/epoxy/src \
+ -I$(call gb_UnpackedTarball_get_dir,epoxy)/include \
+ -I$(call gb_UnpackedTarball_get_dir,epoxy)/src \
$$(INCLUDE) \
))
diff --git a/external/pdfium/Library_pdfium.mk
b/external/pdfium/Library_pdfium.mk
index 5ae29a937344..9bc2d67b400f 100644
--- a/external/pdfium/Library_pdfium.mk
+++ b/external/pdfium/Library_pdfium.mk
@@ -14,8 +14,8 @@ $(eval $(call gb_Library_use_unpacked,pdfium,pdfium))
$(eval $(call gb_Library_set_warnings_not_errors,pdfium))
$(eval $(call gb_Library_set_include,pdfium,\
- -I$(WORKDIR)/UnpackedTarball/pdfium \
- -I$(WORKDIR)/UnpackedTarball/pdfium/third_party \
+ -I$(call gb_UnpackedTarball_get_dir,pdfium) \
+ -I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party \
$$(INCLUDE) \
))
@@ -554,8 +554,8 @@ $(eval $(call gb_Library_add_defs,pdfium,\
else
$(eval $(call gb_Library_set_include,pdfium,\
- -I$(WORKDIR)/UnpackedTarball/pdfium/third_party/freetype/include/ \
- -I$(WORKDIR)/UnpackedTarball/pdfium/third_party/freetype/src/include/ \
+ -I$(call gb_UnpackedTarball_get_dir,pdfium)/third_party/freetype/include/ \
+ -I$(call
gb_UnpackedTarball_get_dir,pdfium)/third_party/freetype/src/include/ \
$$(INCLUDE) \
))
diff --git a/external/redland/Library_rasqal.mk
b/external/redland/Library_rasqal.mk
index 58f6db1e6a27..a62a5491b721 100644
--- a/external/redland/Library_rasqal.mk
+++ b/external/redland/Library_rasqal.mk
@@ -29,9 +29,9 @@ $(eval $(call gb_Library_add_defs,rasqal,\
))
$(eval $(call gb_Library_set_include,rasqal,\
- -I$(WORKDIR)/UnpackedTarball/rasqal/libmtwist \
- -I$(WORKDIR)/UnpackedTarball/rasqal/libsv \
- -I$(WORKDIR)/UnpackedTarball/rasqal/src \
+ -I$(call gb_UnpackedTarball_get_dir,rasqal)/libmtwist \
+ -I$(call gb_UnpackedTarball_get_dir,rasqal)/libsv \
+ -I$(call gb_UnpackedTarball_get_dir,rasqal)/src \
$$(INCLUDE) \
))
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
