mirror of
https://github.com/valitydev/thrift.git
synced 2024-11-06 18:35:19 +00:00
[THRIFT-70] Allow the Java install prefix to be configured.
Systems like Debian expect the thrift jar to be in /usr/share/java, not the default /usr/local/lib This patch allows configure to be passed a JAVA_PREFIX= flag. git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@675821 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
parent
53f18f01be
commit
f0c21a72cd
@ -12,6 +12,11 @@ AC_ARG_VAR([PY_PREFIX], [Prefix for installing Python modules.
|
||||
Default = "/usr"])
|
||||
AS_IF([test "x$PY_PREFIX" = x], [PY_PREFIX="/usr"])
|
||||
|
||||
AC_ARG_VAR([JAVA_PREFIX], [Prefix for installing the Java lib jar.
|
||||
(Normal --prefix is ignored for Java because
|
||||
Java has different conevntions.)
|
||||
Default = "/usr/local/lib"])
|
||||
AS_IF([test "x$JAVA_PREFIX" = x], [JAVA_PREFIX="/usr/local/lib"])
|
||||
|
||||
AC_PROG_CC
|
||||
AC_PROG_CPP
|
||||
|
@ -4,7 +4,7 @@ all-local:
|
||||
$(ANT)
|
||||
|
||||
install-exec-hook:
|
||||
$(ANT) install
|
||||
$(ANT) install -Dinstall.path=$(DESTDIR)$(JAVA_PREFIX)
|
||||
|
||||
# Make sure this doesn't fail if ant is not configured.
|
||||
clean-local:
|
||||
|
@ -4,6 +4,7 @@
|
||||
|
||||
<property name="src" location="src" />
|
||||
<property name="build" location="build" />
|
||||
<property name="install.path" value="/usr/local/lib" />
|
||||
|
||||
<target name="init">
|
||||
<tstamp />
|
||||
@ -20,7 +21,7 @@
|
||||
|
||||
<target name="install" depends="dist">
|
||||
<exec executable="install">
|
||||
<arg line="libthrift.jar /usr/local/lib/" />
|
||||
<arg line="libthrift.jar ${install.path}" />
|
||||
</exec>
|
||||
</target>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user