diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-05-05 19:20:33 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2024-05-06 11:40:45 +0200 |
| commit | 875a1bf2e132e9083f3cf23b0fc59aeedaf61574 (patch) | |
| tree | e0aaa2967914dc9d1ece2055d4dfe3805982b41e /external/postgresql/ExternalProject_postgresql.mk | |
| parent | 971db10d73a0fe80cceca70d19edd02de30be414 (diff) | |
makefile simplification: replace $(call gb_UnpackedTarball_get_dir,foo)
…by a simple/static $(gb_UnpackedTarball_workdir)/foo
see also 0c4c84a14b01c71c76a9c45a7f26aec4d64f3e4f
Change-Id: I8e6aa55c85534c4446556548910c950ddbe7c6fc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/167163
Reviewed-by: Christian Lohmaier <lohmaier+LibreOffice@googlemail.com>
Tested-by: Jenkins
Diffstat (limited to 'external/postgresql/ExternalProject_postgresql.mk')
| -rw-r--r-- | external/postgresql/ExternalProject_postgresql.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk index 1d0a13b6bb03..fe1c7c0a54a9 100644 --- a/external/postgresql/ExternalProject_postgresql.mk +++ b/external/postgresql/ExternalProject_postgresql.mk @@ -43,17 +43,17 @@ endif ifeq ($(ENABLE_OPENSSL),TRUE) ifeq ($(SYSTEM_OPENSSL),) -postgresql_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,openssl)/include -postgresql_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,openssl) $(if $(filter $(OS),LINUX),-pthread) +postgresql_CPPFLAGS += -I$(gb_UnpackedTarball_workdir)/openssl/include +postgresql_LDFLAGS += -L$(gb_UnpackedTarball_workdir)/openssl $(if $(filter $(OS),LINUX),-pthread) endif endif ifeq ($(SYSTEM_OPENLDAP),) -postgresql_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,openldap)/include +postgresql_CPPFLAGS += -I$(gb_UnpackedTarball_workdir)/openldap/include postgresql_LDFLAGS += \ - -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap_r/.libs \ - -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/libldap/.libs \ - -L$(call gb_UnpackedTarball_get_dir,openldap)/libraries/liblber/.libs \ + -L$(gb_UnpackedTarball_workdir)/openldap/libraries/libldap_r/.libs \ + -L$(gb_UnpackedTarball_workdir)/openldap/libraries/libldap/.libs \ + -L$(gb_UnpackedTarball_workdir)/openldap/libraries/liblber/.libs \ endif |