Changeset 4759 for pjproject


Ignore:
Timestamp:
Feb 21, 2014 10:33:22 AM (8 years ago)
Author:
riza
Message:

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

File:
1 edited

Legend:

Unmodified
Added
Removed
  • pjproject/trunk/pjsip-apps/src/swig/java/Makefile

    r4738 r4759  
    115115  JAVA_INC := $(JAVA_HOME)/include 
    116116  JAVA_LIB := $(JAVA_HOME)/lib 
    117   ifeq (exists,$(shell test -d $(JAVA_HOME)/bin && echo exists)) 
     117  ifeq (exists,$(shell test -d "$(JAVA_HOME)/bin" && echo exists)) 
    118118    JAVA_BIN := $(JAVA_HOME)/bin 
    119119  else 
     
    125125# Env settings, e.g: path to SWIG, JDK, java(.exe), javac(.exe) 
    126126MY_SWIG          := swig 
    127 MY_JAVA          := $(JAVA_BIN)/java 
    128 MY_JAVAC         := $(JAVA_BIN)/javac 
    129 MY_JNI_CFLAGS    := -I$(JAVA_INC) -I$(JAVA_INC)/win32 \ 
    130                     -I$(JAVA_INC)/linux -I$(JAVA_INC)/darwin -I. 
    131 MY_JNI_LDFLAGS   := -L$(JAVA_LIB) 
     127MY_JAVA          := "$(JAVA_BIN)/java" 
     128MY_JAVAC         := "$(JAVA_BIN)/javac" 
     129MY_JNI_CFLAGS    := -I"$(JAVA_INC)" -I"$(JAVA_INC)/win32" \ 
     130                    -I"$(JAVA_INC)/linux" -I"$(JAVA_INC)/darwin" -I. 
     131MY_JNI_LDFLAGS   := -L"$(JAVA_LIB)" 
    132132 
    133133# OS specific 
Note: See TracChangeset for help on using the changeset viewer.