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 | |
| parent | a3b06ecf4217016c883ce40e52fcd4b6a2d25860 (diff) | |
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'odk')
| -rw-r--r-- | odk/CustomTarget_check.mk | 4 | ||||
| -rw-r--r-- | odk/CustomTarget_html.mk | 4 | ||||
| -rw-r--r-- | odk/Module_odk.mk | 2 | ||||
| -rw-r--r-- | odk/util/check.pl | 2 |
4 files changed, 6 insertions, 6 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) $< \ diff --git a/odk/CustomTarget_html.mk b/odk/CustomTarget_html.mk index a00bb2a14517..bcbf954a8fe2 100644 --- a/odk/CustomTarget_html.mk +++ b/odk/CustomTarget_html.mk @@ -23,8 +23,8 @@ $(call gb_CustomTarget_get_workdir,odk/html)/%.html : $(SRCDIR)/odk/%.html -e 's|%DOXYGEN_PREFIX0%|$(if $(DOXYGEN),.,http://api.libreoffice.org)|g' \ -e 's|%DOXYGEN_PREFIX1%|$(if $(DOXYGEN),..,http://api.libreoffice.org)|g' \ -e 's|%DOXYGEN_PREFIX2%|$(if $(DOXYGEN),../..,http://api.libreoffice.org)|g' \ - -e 's|%JAVADOC_PREFIX0%|$(if $(SOLAR_JAVA),.,http://api.libreoffice.org)|g' \ - -e 's|%JAVADOC_PREFIX1%|$(if $(SOLAR_JAVA),..,http://api.libreoffice.org)|g' \ + -e 's|%JAVADOC_PREFIX0%|$(if $(ENABLE_JAVA),.,http://api.libreoffice.org)|g' \ + -e 's|%JAVADOC_PREFIX1%|$(if $(ENABLE_JAVA),..,http://api.libreoffice.org)|g' \ < $< > $@ # vim: set noet sw=4 ts=4: diff --git a/odk/Module_odk.mk b/odk/Module_odk.mk index 6b35409746c5..6908f2c05eaa 100644 --- a/odk/Module_odk.mk +++ b/odk/Module_odk.mk @@ -48,7 +48,7 @@ $(eval $(call gb_Module_add_targets,odk,\ )) endif -ifneq ($(SOLAR_JAVA),) +ifneq ($(ENABLE_JAVA),) $(eval $(call gb_Module_add_targets,odk,\ $(if $(filter YESGCC,$(BUILD_UNOWINREG)$(COM)),CustomTarget_unowinreg) \ CustomTarget_classes \ diff --git a/odk/util/check.pl b/odk/util/check.pl index 0cab1118e678..31c857a66f6b 100644 --- a/odk/util/check.pl +++ b/odk/util/check.pl @@ -190,7 +190,7 @@ if (-d "$SdkDir") { #check java docu, it is only a first and simple check # improvement required - my $solar_java = $ENV{"SOLAR_JAVA"}; + my $solar_java = $ENV{"ENABLE_JAVA"}; my $JDK = $ENV{"JDK"}; if (defined($solar_java) && $solar_java ne "" && (!defined($JDK) || $JDK ne "gcj")) { print "check java docu: "; |