From 08452f1208a2ecbf7c6f15a96efeedbe5210ec83 Mon Sep 17 00:00:00 2001 From: Tor Lillqvist Date: Mon, 19 Aug 2013 00:41:12 +0300 Subject: Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3 --- postprocess/CustomTarget_images.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'postprocess/CustomTarget_images.mk') diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index 2e16ad8aad7d..8c2963d0a50e 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -31,7 +31,7 @@ $(packimages_DIR)/%.zip : \ $(packimages_DIR)/sorted.lst \ $(packimages_DIR)/commandimagelist.ilst \ $(call gb_Helper_optional,HELP,$(helpimages_DIR)/helpimg.ilst) \ - $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(SOLAR_JAVA),$(SRCDIR)/connectivity/source/drivers/hsqldb/hsqlui.ilst)) \ + $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_JAVA),$(SRCDIR)/connectivity/source/drivers/hsqldb/hsqlui.ilst)) \ $(call gb_Postprocess_get_target,AllResources) \ $(call gb_Postprocess_get_target,AllUIConfigs) $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,2) @@ -48,7 +48,7 @@ $(packimages_DIR)/%.zip : \ -l $(dir $(call gb_ResTarget_get_imagelist_target)) \ -l $(dir $(call gb_UIConfig_get_imagelist_target)) \ -l $(dir $(call gb_UIConfig_get_imagelist_target,modules/)) \ - $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(SOLAR_JAVA),-l $(SRCDIR)/connectivity/source/drivers/hsqldb)) \ + $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_JAVA),-l $(SRCDIR)/connectivity/source/drivers/hsqldb)) \ $(call gb_Helper_optional,DBCONNECTIVITY,$(if $(ENABLE_FIREBIRD_SDBC),-l $(SRCDIR)/connectivity/source/drivers/firebird)) \ -s $< -o $@ \ $(if $(findstring s,$(MAKEFLAGS)),> /dev/null)) -- cgit