From: František Dvořák <valtri@civ.zcu.cz>
Date: Mon, 14 Jun 2010 17:51:27 +0000 (+0000)
Subject: Build on more platforms.
X-Git-Tag: glite-jobid-api-c_R_1_0_4_1~13
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=2b0720a4bdb19a861bf2eba92d0d1bfaeead2dcf;p=jra1mw.git

Build on more platforms.
---

diff --git a/org.glite.lb.client-java/Makefile b/org.glite.lb.client-java/Makefile
index 890b4d2..fb5bec8 100644
--- a/org.glite.lb.client-java/Makefile
+++ b/org.glite.lb.client-java/Makefile
@@ -35,7 +35,7 @@ build-c:
 	${JAVAH} -classpath build -jni -d build org.glite.lb.ContextIL
 	-mkdir -p build/c
 	-ln -s ../../src_c/Makefile build/c
-	cd build/c && make PREFIX=${PREFIX} JAVA_HOME=${jdk_prefix} topdir=../..
+	cd build/c && $(MAKE) PREFIX=${PREFIX} JAVA_HOME=${jdk_prefix} topdir=../..
 
 examples: ${EXAMPLES}
 
@@ -60,10 +60,10 @@ check:
 install:
 	mkdir -p ${PREFIX}/share/java
 	cp build/lb-client-java.jar ${PREFIX}/share/java
-	cd build/c && make install PREFIX=${PREFIX}
+	cd build/c && $(MAKE) install PREFIX=${PREFIX}
 
 clean:
 	rm -rf build
-	cd src_c && make clean
+	cd src_c && $(MAKE) clean
 
 
diff --git a/org.glite.lb.client-java/src_c/Makefile b/org.glite.lb.client-java/src_c/Makefile
index 6e76ae4..2124d30 100755
--- a/org.glite.lb.client-java/src_c/Makefile
+++ b/org.glite.lb.client-java/src_c/Makefile
@@ -4,6 +4,8 @@
 CC=gcc
 PATH_TO_JAVA=${JAVA_HOME}
 
+OS=$(shell uname | tr '[:upper:]' '[:lower:]')
+
 LIB=libglite_lb_sendviasocket.la
 OBJ=send_via_socket.lo
 
@@ -15,7 +17,7 @@ ${LIB}: ${OBJ}
 	libtool --mode=link ${CC} -rpath ${PREFIX}/${libdir} -o $@ ${OBJ}
 
 %.lo: %.c
-	libtool --mode=compile ${CC} -I.. -I${PATH_TO_JAVA}/include -I${PATH_TO_JAVA}/include/linux -c $<
+	libtool --mode=compile ${CC} -I.. -I${PATH_TO_JAVA}/include -I${PATH_TO_JAVA}/include/$(OS) -c $<
 
 install: compile
 	-mkdir -p ${PREFIX}/${libdir}