diff options
| author | Mark Spruiell <mes@zeroc.com> | 2015-03-13 19:49:12 +0000 |
|---|---|---|
| committer | Mark Spruiell <mes@zeroc.com> | 2015-03-13 19:49:12 +0000 |
| commit | 072866f867c98413b6b04fd8b49826329d678f8b (patch) | |
| tree | 734fe6de99691ab33c7c011c653d01e38d74f952 /java/gradle | |
| parent | ICE-6354 - Bring git repo and source dist closer together (diff) | |
| download | ice-072866f867c98413b6b04fd8b49826329d678f8b.tar.bz2 ice-072866f867c98413b6b04fd8b49826329d678f8b.tar.xz ice-072866f867c98413b6b04fd8b49826329d678f8b.zip | |
fixing ice.gradle for SLES RPM build
Diffstat (limited to 'java/gradle')
| -rw-r--r-- | java/gradle/ice.gradle | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/java/gradle/ice.gradle b/java/gradle/ice.gradle index 41bf7e08f06..58d25962d7e 100644 --- a/java/gradle/ice.gradle +++ b/java/gradle/ice.gradle @@ -52,7 +52,10 @@ if (prefix == null || prefix.length() == 0) { } // Installation location for jar/pom & executables. -if (prefix.startsWith("/usr") || prefix.startsWith("/usr/local")) { +// +// Note that we exclude /usr/src/packages because it's the RPM build directory on SLES. +// +if ((prefix.startsWith("/usr") || prefix.startsWith("/usr/local")) && !prefix.startsWith("/usr/src/packages")) { ext.jarDir = prefix + "/share/java" ext.binDir = prefix + "/bin" } else { |