diff options
| -rw-r--r-- | RepositoryModule_host.mk | 1 | ||||
| -rw-r--r-- | external/Module_external.mk | 1 | ||||
| -rw-r--r-- | external/postgresql/ExternalProject_postgresql.mk (renamed from postgresql/ExternalProject_postgresql.mk) | 0 | ||||
| -rw-r--r-- | external/postgresql/Makefile (renamed from postgresql/Makefile) | 2 | ||||
| -rw-r--r-- | external/postgresql/Module_postgresql.mk (renamed from postgresql/Module_postgresql.mk) | 0 | ||||
| -rw-r--r-- | external/postgresql/README (renamed from postgresql/README) | 0 | ||||
| -rw-r--r-- | external/postgresql/UnpackedTarball_postgresql.mk (renamed from postgresql/UnpackedTarball_postgresql.mk) | 6 | ||||
| -rw-r--r-- | external/postgresql/postgresql-9.2.1-autoreconf.patch (renamed from postgresql/postgresql-9.2.1-autoreconf.patch) | 0 | ||||
| -rw-r--r-- | external/postgresql/postgresql-9.2.1-libreoffice.patch (renamed from postgresql/postgresql-9.2.1-libreoffice.patch) | 0 | ||||
| -rw-r--r-- | external/postgresql/postgresql-libs-leak.patch (renamed from postgresql/postgresql-libs-leak.patch) | 0 |
10 files changed, 5 insertions, 5 deletions
diff --git a/RepositoryModule_host.mk b/RepositoryModule_host.mk index ced54decd36e..253c52e76754 100644 --- a/RepositoryModule_host.mk +++ b/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) \ diff --git a/external/Module_external.mk b/external/Module_external.mk index 481f46e76d61..d7b041b02d4b 100644 --- a/external/Module_external.mk +++ b/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) \ diff --git a/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk index afa7ff3162b7..afa7ff3162b7 100644 --- a/postgresql/ExternalProject_postgresql.mk +++ b/external/postgresql/ExternalProject_postgresql.mk diff --git a/postgresql/Makefile b/external/postgresql/Makefile index ccb1c85a04da..e4968cf85fb6 100644 --- a/postgresql/Makefile +++ b/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: diff --git a/postgresql/Module_postgresql.mk b/external/postgresql/Module_postgresql.mk index 80c835639717..80c835639717 100644 --- a/postgresql/Module_postgresql.mk +++ b/external/postgresql/Module_postgresql.mk diff --git a/postgresql/README b/external/postgresql/README index edc3d5df2781..edc3d5df2781 100644 --- a/postgresql/README +++ b/external/postgresql/README diff --git a/postgresql/UnpackedTarball_postgresql.mk b/external/postgresql/UnpackedTarball_postgresql.mk index c7e17045a43b..3d0fe6cf6c26 100644 --- a/postgresql/UnpackedTarball_postgresql.mk +++ b/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: diff --git a/postgresql/postgresql-9.2.1-autoreconf.patch b/external/postgresql/postgresql-9.2.1-autoreconf.patch index 9cbf84f252c8..9cbf84f252c8 100644 --- a/postgresql/postgresql-9.2.1-autoreconf.patch +++ b/external/postgresql/postgresql-9.2.1-autoreconf.patch diff --git a/postgresql/postgresql-9.2.1-libreoffice.patch b/external/postgresql/postgresql-9.2.1-libreoffice.patch index 87d3da716644..87d3da716644 100644 --- a/postgresql/postgresql-9.2.1-libreoffice.patch +++ b/external/postgresql/postgresql-9.2.1-libreoffice.patch diff --git a/postgresql/postgresql-libs-leak.patch b/external/postgresql/postgresql-libs-leak.patch index 8224137f1f97..8224137f1f97 100644 --- a/postgresql/postgresql-libs-leak.patch +++ b/external/postgresql/postgresql-libs-leak.patch |