Fix (ICE-7807) - Inconsistent install prefix in Java

2 files changed, 12 insertions, 4 deletions

diff --git a/java/gradle.properties b/java/gradle.properties
index e7640fcd9da..cddda8242f3 100644
--- a/java/gradle.properties
+++ b/java/gradle.properties
@@ -7,14 +7,22 @@
 //
 // **********************************************************************
 
+//
+// Version used in JAR files
+//
 iceVersion = 3.7.0-beta0
 
 //
+// Prefix version
+//
+prefixVersion = 3.7b0
+
+//
 // Select an installation base directory. The directory will be created
 // if it does not exist. If this property is not set the default will be
 // used. Default values are:
-//   - Windows: %SystemDrive%\Ice-${iceVersion}
-//   - Non Windows /opt/Ice-${iceVersion}
+//   - Windows: %SystemDrive%\Ice-${prefixVersion}
+//   - Non Windows /opt/Ice-${prefixVersion}
 //
 prefix =
 
diff --git a/java/gradle/ice.gradle b/java/gradle/ice.gradle
index f624e929ec3..61739f8b117 100644
--- a/java/gradle/ice.gradle
+++ b/java/gradle/ice.gradle
@@ -72,9 +72,9 @@ def isWindows = System.properties['os.name'].toLowerCase().contains('windows')
 if (!prefix) {
     // If the prefix isn't set use these default locations.
     if (isWindows) {
-        prefix = "C:\\Ice-${project.version}"
+        prefix = "C:\\Ice-${prefixVersion}"
     } else {
-        prefix = "/opt/Ice-${project.version}"
+        prefix = "/opt/Ice-${prefixVersion}"
     }
 }