Author: dreiss
Date: Thu Jul 10 18:26:16 2008
New Revision: 675821
URL: http://svn.apache.org/viewvc?rev=675821&view=rev
Log:
[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.
Modified:
incubator/thrift/trunk/configure.ac
incubator/thrift/trunk/lib/java/Makefile.am
incubator/thrift/trunk/lib/java/build.xml
Modified: incubator/thrift/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/configure.ac?rev=675821&r1=675820&r2=675821&view=diff
==============================================================================
--- incubator/thrift/trunk/configure.ac (original)
+++ incubator/thrift/trunk/configure.ac Thu Jul 10 18:26:16 2008
@@ -12,6 +12,11 @@
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
Modified: incubator/thrift/trunk/lib/java/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/Makefile.am?rev=675821&r1=675820&r2=675821&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/Makefile.am (original)
+++ incubator/thrift/trunk/lib/java/Makefile.am Thu Jul 10 18:26:16 2008
@@ -4,7 +4,7 @@
$(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:
Modified: incubator/thrift/trunk/lib/java/build.xml
URL:
http://svn.apache.org/viewvc/incubator/thrift/trunk/lib/java/build.xml?rev=675821&r1=675820&r2=675821&view=diff
==============================================================================
--- incubator/thrift/trunk/lib/java/build.xml (original)
+++ incubator/thrift/trunk/lib/java/build.xml Thu Jul 10 18:26:16 2008
@@ -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>
