apache-ant: source jdk profile instead of setting JAVA_HOME by hand
This commit is contained in:
parent
aa3d53a4c7
commit
885cfdfdf9
@ -20,11 +20,13 @@ do_configure() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
do_build() {
|
do_build() {
|
||||||
JAVA_HOME=/usr/share/java/oracle-jdk ./build.sh -Ddist.dir=$DESTDIR/$_prefix jars
|
source /etc/profile.d/oracle-jdk.sh
|
||||||
|
./build.sh -Ddist.dir=$DESTDIR/$_prefix jars
|
||||||
}
|
}
|
||||||
|
|
||||||
do_install() {
|
do_install() {
|
||||||
JAVA_HOME=/usr/share/java/oracle-jdk ./build.sh -Ddist.dir=$DESTDIR/$_prefix dist
|
source /etc/profile.d/oracle-jdk.sh
|
||||||
|
./build.sh -Ddist.dir=$DESTDIR/$_prefix dist
|
||||||
|
|
||||||
vinstall ${FILESDIR}/apache-ant.sh 644 etc/profile.d
|
vinstall ${FILESDIR}/apache-ant.sh 644 etc/profile.d
|
||||||
rm $DESTDIR/$_prefix/bin/*.bat
|
rm $DESTDIR/$_prefix/bin/*.bat
|
||||||
|
Loading…
x
Reference in New Issue
Block a user