diff options
author | Tor Lillqvist <tml@iki.fi> | 2013-08-19 00:41:12 +0300 |
---|---|---|
committer | Tor Lillqvist <tml@iki.fi> | 2013-08-19 10:29:04 +0300 |
commit | 08452f1208a2ecbf7c6f15a96efeedbe5210ec83 (patch) | |
tree | fb09bce47d74d368ae9449bf4a5dc9e33c1ac1a8 /odk/CustomTarget_check.mk | |
parent | a3b06ecf4217016c883ce40e52fcd4b6a2d25860 (diff) |
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'odk/CustomTarget_check.mk')
-rw-r--r-- | odk/CustomTarget_check.mk | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/odk/CustomTarget_check.mk b/odk/CustomTarget_check.mk index 1ea17a1c8ec5..ab6573e8bedb 100644 --- a/odk/CustomTarget_check.mk +++ b/odk/CustomTarget_check.mk @@ -37,13 +37,13 @@ $(call gb_CustomTarget_get_workdir,odk/check)/checkbin : \ ) \ $(call gb_Package_get_target,odk_docs) \ $(call gb_Package_get_target,odk_html) \ - $(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_javadoc)) \ + $(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_javadoc)) \ $(call gb_Package_get_target,odk_lib) \ $(if $(filter MACOSX,$(OS)),$(call gb_Package_get_target,odk_macosx)) \ $(call gb_Package_get_target,odk_settings) \ $(call gb_Package_get_target,odk_settings_generated) \ $(call gb_Package_get_target,odk_uno_loader_classes) \ - $(if $(SOLAR_JAVA),$(call gb_Package_get_target,odk_unowinreg)) + $(if $(ENABLE_JAVA),$(call gb_Package_get_target,odk_unowinreg)) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),CHK,1) $(call gb_Helper_print_on_error,\ $(PERL) $< \ |