-- more thrift Makefile changes

Reviewed By: Slee

git-svn-id: https://svn.apache.org/repos/asf/incubator/thrift/trunk@664788 13f79535-47bb-0310-9956-ffa450edef68

diff --git a/test/cpp/Makefile.thrift b/test/cpp/Makefile.thrift
index 361eb57..61a5ec9 100644 (file)
--- a/test/cpp/Makefile.thrift
+++ b/test/cpp/Makefile.thrift
@@ -31,7 +31,7 @@ CC     = g++
 LD     = g++
 
 # Compiler flags
-DCFL  = -Wall -O3 -g -I./gen-cpp $(include_flags) -L$(thrift_home)/lib -lthrift
+DCFL  = -Wall -O3 -g -I./gen-cpp $(include_flags) -L$(thrift_home)/lib/cpp -lthrift
 CFL   = -Wall -O3 -I./gen-cpp $(include_flags) -L$(thrift_home)/lib -lthrift
 
 all: server client

diff --git a/test/java/build.xml b/test/java/build.xml
index d7d712a..d7ebba0 100644 (file)
--- a/test/java/build.xml
+++ b/test/java/build.xml
@@ -5,7 +5,7 @@
   <property name="src" location="src" />
   <property name="gen" location="gen-java" />
   <property name="build" location="build" />
-  <property name="cpath" location="/usr/local/lib/libthrift.jar" />
+  <property name="cpath" location="../../lib/java/libthrift.jar" />
 
   <target name="init">
     <tstamp />
@@ -13,7 +13,7 @@
   </target>
 
   <target name="generate">
-    <exec executable="thrift">
+    <exec executable="../../compiler/cpp/bin/thrift">
       <arg line="--java ../ThriftTest.thrift" />
     </exec>
   </target>

diff --git a/test/php/Makefile b/test/php/Makefile
index 12fd7c8..48394b2 100644 (file)
--- a/test/php/Makefile
+++ b/test/php/Makefile
@@ -7,7 +7,7 @@
 target: all
 
 # Tools
-THRIFT = thrift
+THRIFT = ../../compiler/cpp/bin/thrift
 
 all: normal inline
 

diff --git a/test/py/Makefile b/test/py/Makefile
index 05943dd..fa98224 100644 (file)
--- a/test/py/Makefile
+++ b/test/py/Makefile
@@ -7,7 +7,7 @@
 target: all
 
 # Tools
-THRIFT = thrift
+THRIFT = ../../compiler/cpp/bin/thrift
 
 all: stubs