diff options
| author | Riza Sulistyo <riza@teluu.com> | 2014-02-21 10:33:22 +0000 |
|---|---|---|
| committer | Riza Sulistyo <riza@teluu.com> | 2014-02-21 10:33:22 +0000 |
| commit | cf91cac6d9627cdf57633167971532c410ac6baf (patch) | |
| tree | 286955abb4ad13b25213a1ebeceeb8461edbd917 | |
| parent | a4f1d2a36a5af28ab695d380113879c1e7306f4a (diff) | |
Re #1519: Fix error build (swig java) when JAVA_HOME is set to folder name separated by space (' ')
git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@4759 74dad513-b988-da41-8d7b-12977e46ad98
| -rw-r--r-- | pjsip-apps/src/swig/java/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pjsip-apps/src/swig/java/Makefile b/pjsip-apps/src/swig/java/Makefile index fa6b5130..b72f6ee1 100644 --- a/pjsip-apps/src/swig/java/Makefile +++ b/pjsip-apps/src/swig/java/Makefile @@ -114,7 +114,7 @@ else 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 JAVA_BIN := $(JAVA_HOME) @@ -124,11 +124,11 @@ endif # 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 ifeq ($(OS),Windows_NT) |