diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/config/build.properties | 3 | ||||
| -rw-r--r-- | java/config/common.xml | 8 |
2 files changed, 6 insertions, 5 deletions
diff --git a/java/config/build.properties b/java/config/build.properties index 7d36dec4483..4f77bc1bafe 100644 --- a/java/config/build.properties +++ b/java/config/build.properties @@ -19,7 +19,8 @@ debug = on # jdk.version = ${ant.java.version} -ice.version = 3.2.0 +ice.version = 3.2 +ice.version.patch = 3.2.0 # # Define lint.unchecked as on if you want to use the Java5 compiler diff --git a/java/config/common.xml b/java/config/common.xml index bf338b27251..008e37ca4fb 100644 --- a/java/config/common.xml +++ b/java/config/common.xml @@ -98,7 +98,7 @@ <condition property="ice.dir" value="/usr"> <and> - <available file="/usr/share/Ice-${ice.version}/slice"/> + <available file="/usr/share/Ice-${ice.version.patch}/slice"/> <not> <isset property="ice.dir"/> </not> @@ -150,7 +150,7 @@ <!-- RPM --> <condition property="icej.dir" value="/usr"> <and> - <available file="/usr/lib/Ice-${ice.version}/Ice.jar"/> + <available file="/usr/lib/Ice-${ice.version.patch}/Ice.jar"/> <not> <isset property="icej.dir"/> </not> @@ -201,12 +201,12 @@ <!-- In C++, RPM installs have precedence over installs in the default Ice location (i.e. /opt/Ice-${ice.version}) so the same will be done here. --> <condition property="lib.dir" - value="/usr/lib/Ice-${ice.version}" + value="/usr/lib/Ice-${ice.version.patch}" else="${icej.dir}/lib"> <isset property="with-rpm"/> </condition> - <condition property="slice.dir" value="/usr/share/Ice-${ice.version}/slice" else="${ice.dir}/slice"> + <condition property="slice.dir" value="/usr/share/Ice-${ice.version.patch}/slice" else="${ice.dir}/slice"> <isset property="with-rpm"/> </condition> |