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 /xmerge | |
| parent | a3b06ecf4217016c883ce40e52fcd4b6a2d25860 (diff) | |
Rename SOLAR_JAVA to ENABLE_JAVA and HAVE_FEATURE_JAVA
Change-Id: Ib451bdb3c1c2ca42347abfde44651d5cf5eef4f3
Diffstat (limited to 'xmerge')
| -rw-r--r-- | xmerge/Module_xmerge.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/xmerge/Module_xmerge.mk b/xmerge/Module_xmerge.mk index 380df59d31f0..e92da2ae9cb5 100644 --- a/xmerge/Module_xmerge.mk +++ b/xmerge/Module_xmerge.mk @@ -10,7 +10,7 @@ $(eval $(call gb_Module_Module,xmerge)) $(eval $(call gb_Module_add_targets,xmerge,\ - $(if $(SOLAR_JAVA), \ + $(if $(ENABLE_JAVA), \ Jar_xmerge \ Jar_XMergeBridge \ ) \ |