fdo#70393: move zlib to a subdir of external

Change-Id: I13dec52e6999d9c8aa0ba1f0c31ee8c36e1b6aac
Reviewed-on: https://gerrit.libreoffice.org/6556Reviewed-by: David Tardon <dtardon@redhat.com>
Tested-by: David Tardon <dtardon@redhat.com>

RepositoryModule_build.mk

@@ -85,7 +85,6 @@ $(eval $(call gb_Module_add_moduledirs,cross_toolset,\
 		xmlhelp \
 	) \
 	$(call gb_Helper_optional,QADEVOOO,qadevOOo) \
-	$(call gb_Helper_optional,ZLIB,zlib) \
 ))
 
 # vim: set shiftwidth=4 tabstop=4 noexpandtab:

RepositoryModule_host.mk

@@ -153,7 +153,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	xmlreader \
 	xmlscript \
 	xmlsecurity \
-	$(call gb_Helper_optional,ZLIB,zlib) \
 ))
 
 ifneq ($(MERGELIBS),)

external/Module_external.mk

@@ -80,6 +80,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,WPG,libwpg) \
 	$(call gb_Helper_optional,WPS,libwps) \
 	$(call gb_Helper_optional,XSLTML,xsltml) \
+	$(call gb_Helper_optional,ZLIB,zlib) \
 	$(call gb_Helper_optional_for_host,DESKTOP, \
 		$(if $(filter YES,$(WITH_GALLERY_BUILD)), \
 			$(call gb_Helper_optional,HARFBUZZ,harfbuzz) \

zlib/Makefile → external/zlib/Makefile

@@ -9,6 +9,6 @@
 
 module_directory:=$(dir $(realpath $(firstword $(MAKEFILE_LIST))))
 
-include $(module_directory)/../solenv/gbuild/partial_build.mk
+include $(module_directory)/../../solenv/gbuild/partial_build.mk
 
 # vim: set noet sw=4 ts=4: