diff options
| author | Michael Stahl <mstahl@redhat.com> | 2014-02-11 15:57:18 +0100 |
|---|---|---|
| committer | Michael Stahl <mstahl@redhat.com> | 2014-02-12 09:53:08 +0100 |
| commit | e3abec3f07f2a710bfce66f77b33f494e2aa4972 (patch) | |
| tree | 740f34ea017abc08ce444b93ccad57a628e4f444 /external/postgresql | |
| parent | b62f5c2a22d968d06ea9e638126278bbd1158bf6 (diff) | |
fdo#74825: fix missing lcms2/libxslt/curl in installation sets
The assumption that all configure variables had been normalized to
TRUE/<empty> turned out not to hold; convert a bit more in that
direction.
(regression from 4af38b099c741c3676aefeb20c515913aaeed666)
Change-Id: I2127c515e8a833a07c9b26ed9d693ce5a1853fe4
Diffstat (limited to 'external/postgresql')
| -rw-r--r-- | external/postgresql/ExternalProject_postgresql.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/external/postgresql/ExternalProject_postgresql.mk b/external/postgresql/ExternalProject_postgresql.mk index 3afa7b80ff28..cd9d8a2ede6a 100644 --- a/external/postgresql/ExternalProject_postgresql.mk +++ b/external/postgresql/ExternalProject_postgresql.mk @@ -32,7 +32,7 @@ postgresql_CPPFLAGS := $(ZLIB_CFLAGS) postgresql_LDFLAGS := ifeq ($(DISABLE_OPENSSL),) -ifeq ($(SYSTEM_OPENSSL),NO) +ifeq ($(SYSTEM_OPENSSL),) postgresql_CPPFLAGS += -I$(call gb_UnpackedTarball_get_dir,openssl)/include postgresql_LDFLAGS += -L$(call gb_UnpackedTarball_get_dir,openssl)/ endif @@ -44,7 +44,7 @@ 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 \ - $(if $(filter NO,$(SYSTEM_NSS)),\ + $(if $(SYSTEM_NSS),,\ -L$(call gb_UnpackedTarball_get_dir,nss)/dist/out/lib) \ endif |