Changeset 4759 for pjproject

Timestamp:

Feb 21, 2014 10:33:22 AM (11 years ago)

Author:

riza

Message:

Re #1519: Fix error build (swig java) when JAVA_HOME is set to folder name separated by space (' ')

File:

• pjproject/trunk/pjsip-apps/src/swig/java/Makefile (modified) (2 diffs)

pjproject/trunk/pjsip-apps/src/swig/java/Makefile

@@ -115 +115 @@
   JAVA_INC := $(JAVA_HOME)/include
   JAVA_LIB := $(JAVA_HOME)/lib
-  ifeq (exists,$(shell test -d $(JAVA_HOME)/bin && echo exists))
+  ifeq (exists,$(shell test -d "$(JAVA_HOME)/bin" && echo exists))
     JAVA_BIN := $(JAVA_HOME)/bin
   else
@@ -125 +125 @@
 # Env settings, e.g: path to SWIG, JDK, java(.exe), javac(.exe)
 MY_SWIG          := swig
-MY_JAVA          := $(JAVA_BIN)/java
-MY_JAVAC         := $(JAVA_BIN)/javac
-MY_JNI_CFLAGS    := -I$(JAVA_INC) -I$(JAVA_INC)/win32 \
-                    -I$(JAVA_INC)/linux -I$(JAVA_INC)/darwin -I.
-MY_JNI_LDFLAGS   := -L$(JAVA_LIB)
+MY_JAVA          := "$(JAVA_BIN)/java"
+MY_JAVAC         := "$(JAVA_BIN)/javac"
+MY_JNI_CFLAGS    := -I"$(JAVA_INC)" -I"$(JAVA_INC)/win32" \
+                    -I"$(JAVA_INC)/linux" -I"$(JAVA_INC)/darwin" -I.
+MY_JNI_LDFLAGS   := -L"$(JAVA_LIB)"
 
 # OS specific