diff options
| author | Michael Stahl <michael.stahl@allotropia.de> | 2021-01-21 14:26:01 +0100 |
|---|---|---|
| committer | Michael Stahl <michael.stahl@allotropia.de> | 2021-01-22 11:31:31 +0100 |
| commit | 2cca78f81e8acacb324a1ff1aa404ead1144549c (patch) | |
| tree | ec0eaabcda906b41544f19fd5a0b6f326ddafef8 /RepositoryExternal.mk | |
| parent | 1c003228bdb3353539fea812eebf60cda9e5aec8 (diff) | |
postgresql: fix mistake in RepositoryExternal.mk
Apparently causes "ERROR: Source for postgresql.filelist not found!" on
non-WNT.
Change-Id: I79cf9074bc8e4948febe76fc963231c916a274cb
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109760
Reviewed-by: Stephan Bergmann <sbergman@redhat.com>
Tested-by: Jenkins
(cherry picked from commit 5e6e87f1556e484c4d4be7e3b01ef668ab602f3c)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/109745
Reviewed-by: Jean-Baptiste Faure <jbfaure@libreoffice.org>
Reviewed-by: Michael Stahl <michael.stahl@allotropia.de>
Diffstat (limited to 'RepositoryExternal.mk')
| -rw-r--r-- | RepositoryExternal.mk | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/RepositoryExternal.mk b/RepositoryExternal.mk index 8ede95168201..78cc07bdd7a1 100644 --- a/RepositoryExternal.mk +++ b/RepositoryExternal.mk @@ -3050,6 +3050,12 @@ endef else # !SYSTEM_POSTGRESQL +ifeq ($(OS),WNT) +$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\ + postgresql \ +)) +endif # WNT + define gb_LinkTarget__use_postgresql $(call gb_LinkTarget_use_external_project,$(1),postgresql,full) @@ -3062,10 +3068,6 @@ $(call gb_LinkTarget_set_include,$(1),\ ifeq ($(OS),WNT) -$(eval $(call gb_Helper_register_packages_for_install,postgresqlsdbc,\ - postgresql \ -)) - $(call gb_LinkTarget_add_libs,$(1),\ $(call gb_UnpackedTarball_get_dir,postgresql)/$(gb_MSBUILD_CONFIG)/libpq/libpq.lib \ ) |