summaryrefslogtreecommitdiffstats
path: root/scp2/InstallModule_ooo.mk
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-02-11 15:57:18 +0100
committerMichael Stahl <mstahl@redhat.com>2014-02-12 09:53:08 +0100
commite3abec3f07f2a710bfce66f77b33f494e2aa4972 (patch)
tree740f34ea017abc08ce444b93ccad57a628e4f444 /scp2/InstallModule_ooo.mk
parentDOCX Export of 'Table Row Redline' (like insert row or delete row) (diff)
downloadcore-e3abec3f07f2a710bfce66f77b33f494e2aa4972.tar.gz
core-e3abec3f07f2a710bfce66f77b33f494e2aa4972.zip
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 'scp2/InstallModule_ooo.mk')
-rw-r--r--scp2/InstallModule_ooo.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/scp2/InstallModule_ooo.mk b/scp2/InstallModule_ooo.mk
index 4d4e33d0557b..7f53d5fd2495 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -119,13 +119,13 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DICU_MAJOR=$(ICU_MAJOR) \
))
-ifneq ($(SYSTEM_LIBXSLT),YES)
+ifeq ($(SYSTEM_LIBXSLT),)
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DLIBXSLT_MAJOR=$(LIBXSLT_MAJOR) \
))
endif
-ifneq ($(SYSTEM_REDLAND),YES)
+ifeq ($(SYSTEM_REDLAND),)
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DRAPTOR_MAJOR=$(RAPTOR_MAJOR) \