Use gb_UnpackedTarball_get_dir

Change-Id: I931f0d95cad0a63d344c84d89ba7c80f14be8ec9

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) \
 ))
 

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) \
 ))
 

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) \
 ))
 

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) \
 ))