summaryrefslogtreecommitdiff
path: root/scp2
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2014-02-11 19:35:22 +0100
committerMichael Stahl <mstahl@redhat.com>2014-02-12 09:53:11 +0100
commit32db4993c469613362211e7ef8423da6d7f4b182 (patch)
tree0dfc314d774e04d9ff4edec88bb68fc2a31420da /scp2
parent8555b378596b19c122fa29a22f77a576a211c1fc (diff)
normalize values of SYSTEM_POPPLER, SYSTEM_JFREEREPORT
Change-Id: I8034b6fdf85697b6b409143396983ef3170257b2
Diffstat (limited to 'scp2')
-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 9299aedf268e..af0a262ea912 100644
--- a/scp2/InstallModule_ooo.mk
+++ b/scp2/InstallModule_ooo.mk
@@ -8,7 +8,7 @@
#
ifeq ($(ENABLE_REPORTBUILDER),TRUE)
-ifneq ($(SYSTEM_JFREEREPORT),YES)
+ifeq ($(SYSTEM_JFREEREPORT),)
include $(SRCDIR)/external/jfreereport/version.mk
endif
endif
@@ -134,7 +134,7 @@ $(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
))
endif
-ifneq ($(SYSTEM_JFREEREPORT),YES)
+ifeq ($(SYSTEM_JFREEREPORT),)
$(eval $(call gb_InstallModule_add_defs,scp2/ooo,\
-DFLUTE_VERSION=$(FLUTE_VERSION) \