summaryrefslogtreecommitdiff
path: root/java/src
diff options
context:
space:
mode:
Diffstat (limited to 'java/src')
-rw-r--r--java/src/Ice/build.gradle6
-rw-r--r--java/src/IceGridGUI/build.gradle4
2 files changed, 5 insertions, 5 deletions
diff --git a/java/src/Ice/build.gradle b/java/src/Ice/build.gradle
index 03d1dd253b8..acc5e1bcf89 100644
--- a/java/src/Ice/build.gradle
+++ b/java/src/Ice/build.gradle
@@ -31,17 +31,17 @@ apply from: "$rootProject.projectDir/gradle/library.gradle"
// to the buildSrc gradle file.
task installSlicePlugin(type: Copy) {
from "${rootProject.projectDir}/buildSrc/build/libs/buildSrc.jar"
- into "${DESTDIR}${prefix}/lib"
+ into "${DESTDIR}${jarDir}"
rename { "ice-gradle-plugin-${project.version}.jar" }
}
task installSlicePluginSources(type: Copy) {
from "${rootProject.projectDir}/buildSrc/build/libs/buildSrc-source.jar"
- into "${DESTDIR}${prefix}/lib"
+ into "${DESTDIR}${jarDir}"
rename { "ice-gradle-plugin-${project.version}-source.jar" }
}
task installSlicePluginPom(type: Copy) {
from "${rootProject.projectDir}/buildSrc/buildSrc.pom"
- into "${DESTDIR}${prefix}/lib"
+ into "${DESTDIR}${jarDir}"
rename { "ice-gradle-plugin-${project.version}.pom" }
}
install.dependsOn(installSlicePlugin)
diff --git a/java/src/IceGridGUI/build.gradle b/java/src/IceGridGUI/build.gradle
index 966c26e006c..112233c79e5 100644
--- a/java/src/IceGridGUI/build.gradle
+++ b/java/src/IceGridGUI/build.gradle
@@ -138,7 +138,7 @@ if(macosx)
task copyBundle(type: Copy, dependsOn: bundleapp) {
from "${libDir}/${appName}.app"
- into "${DESTDIR}${prefix}/bin/${appName}.app"
+ into "${DESTDIR}${binDir}/${appName}.app"
}
}
@@ -149,7 +149,7 @@ clean {
task copyJars(type: Copy, dependsOn: updateManifest) {
from new File("${libDir}/${jarName}")
- into "${DESTDIR}${prefix}/lib"
+ into "${DESTDIR}${jarDir}"
}
task install(dependsOn: copyJars)