summaryrefslogtreecommitdiff
path: root/desktop/Library_migrationoo2.mk
diff options
context:
space:
mode:
authorTor Lillqvist <tml@iki.fi>2013-08-19 00:41:12 +0300
committerTor Lillqvist <tml@iki.fi>2013-08-19 10:29:04 +0300
commit08452f1208a2ecbf7c6f15a96efeedbe5210ec83 (patch)
treefb09bce47d74d368ae9449bf4a5dc9e33c1ac1a8 /desktop/Library_migrationoo2.mk
parenta3b06ecf4217016c883ce40e52fcd4b6a2d25860 (diff)
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'desktop/Library_migrationoo2.mk')
-rw-r--r--desktop/Library_migrationoo2.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/desktop/Library_migrationoo2.mk b/desktop/Library_migrationoo2.mk
index c13485998d2f..e6ea8cf597d0 100644
--- a/desktop/Library_migrationoo2.mk
+++ b/desktop/Library_migrationoo2.mk
@@ -17,7 +17,7 @@ $(eval $(call gb_Library_use_libraries,migrationoo2,\
cppu \
cppuhelper \
i18nlangtag \
- $(if $(filter TRUE,$(SOLAR_JAVA)), \
+ $(if $(ENABLE_JAVA), \
jvmfwk) \
sal \
tl \
@@ -30,7 +30,7 @@ $(eval $(call gb_Library_set_componentfile,migrationoo2,desktop/source/migration
$(eval $(call gb_Library_add_exception_objects,migrationoo2,\
desktop/source/migration/services/basicmigration \
desktop/source/migration/services/cexports \
- $(if $(filter TRUE,$(SOLAR_JAVA)), \
+ $(if $(ENABLE_JAVA), \
desktop/source/migration/services/jvmfwk) \
desktop/source/migration/services/wordbookmigration \
))