fdo#70393: move postgresql to a subdir of external

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

RepositoryModule_host.mk

@@ -85,7 +85,6 @@ $(eval $(call gb_Module_add_moduledirs,libreoffice,\
 	oox \
 	package \
 	padmin \
-	$(call gb_Helper_optional,POSTGRESQL,postgresql) \
 	postprocess \
 	psprint_config \
 	$(call gb_Helper_optional,PYTHON,python3) \

external/Module_external.mk

@@ -69,6 +69,7 @@ $(eval $(call gb_Module_add_moduledirs,external,\
 	$(call gb_Helper_optional,OPENSSL,openssl) \
 	$(call gb_Helper_optional,ORCUS,liborcus) \
 	$(call gb_Helper_optional,POPPLER,poppler) \
+	$(call gb_Helper_optional,POSTGRESQL,postgresql) \
 	$(call gb_Helper_optional,VISIO,libvisio) \
 	$(call gb_Helper_optional,WPD,libwpd) \
 	$(call gb_Helper_optional,WPG,libwpg) \

postgresql/Makefile → external/postgresql/Makefile

@@ -2,6 +2,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:

postgresql/UnpackedTarball_postgresql.mk → external/postgresql/UnpackedTarball_postgresql.mk

@@ -14,9 +14,9 @@ $(eval $(call gb_UnpackedTarball_set_tarball,postgresql,$(POSTGRESQL_TARBALL),,p
 $(eval $(call gb_UnpackedTarball_set_patchlevel,postgresql,3))
 
 $(eval $(call gb_UnpackedTarball_add_patches,postgresql, \
-	postgresql/postgresql-libs-leak.patch \
-	postgresql/postgresql-9.2.1-autoreconf.patch \
-	postgresql/postgresql-9.2.1-libreoffice.patch \
+	external/postgresql/postgresql-libs-leak.patch \
+	external/postgresql/postgresql-9.2.1-autoreconf.patch \
+	external/postgresql/postgresql-9.2.1-libreoffice.patch \
 ))
 
 # vim: set noet sw=4 ts=4: