clucene: remove ExternalPackage_clucene

Change-Id: Ib120919cf3810eeba8332dd572af73c0f4979922

RepositoryExternal.mk

@@ -2006,6 +2006,13 @@ endef
 else # !SYSTEM_CLUCENE
 
 define gb_LinkTarget__use_clucene
+$(call gb_LinkTarget_set_include,$(1),\
+	-I$(call gb_UnpackedTarball_get_dir,clucene)/src/core \
+	-I$(call gb_UnpackedTarball_get_dir,clucene)/src/shared \
+	-I$(call gb_UnpackedTarball_get_dir,clucene)/src/contribs-lib \
+	$$(INCLUDE) \
+)
+
 $(call gb_LinkTarget_use_libraries,$(1),\
 	clucene \
 )

clucene/Library_clucene.mk

@@ -11,8 +11,6 @@ $(eval $(call gb_Library_Library,clucene))
 
 $(eval $(call gb_Library_use_external,clucene,zlib))
 
-$(eval $(call gb_Library_use_package,clucene,clucene_inc))
-
 $(eval $(call gb_Library_use_unpacked,clucene,clucene))
 
 $(eval $(call gb_Library_set_warnings_not_errors,clucene))

clucene/Module_clucene.mk

@@ -12,7 +12,6 @@ $(eval $(call gb_Module_Module,clucene))
 ifeq ($(SYSTEM_CLUCENE),NO)
 ifneq ($(OS),ANDROID)
 $(eval $(call gb_Module_add_targets,clucene,\
-    ExternalPackage_clucene \
     Library_clucene \
 	UnpackedTarball_clucene \
 ))