diff options
| author | Lukas Larsson <lukas@erlang-solutions.com> | 2012-09-10 10:51:57 +0200 |
|---|---|---|
| committer | Lukas Larsson <lukas@erlang-solutions.com> | 2012-09-10 10:51:57 +0200 |
| commit | 1c0608f29558697ec9521467a5f6e632f94a302d (patch) | |
| tree | 036f3beed62c44ac29454c1ad2e97efa9eb04a45 /lib/ic | |
| parent | 7e200a6e6e182f37f9ab6f0a74056b2936bc27a1 (diff) | |
| parent | 11496033f0405437bcef893362f5507b4a79b5c3 (diff) | |
| download | erlang-1c0608f29558697ec9521467a5f6e632f94a302d.tar.gz | |
Merge branch 'lukas/jinterface/whitespace_test_fix' into maint
* lukas/jinterface/whitespace_test_fix:
Do not build jinterface test if there is no jinterface
Escape whitespace in path
Diffstat (limited to 'lib/ic')
| -rw-r--r-- | lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src b/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src index c106261efd..ac8f2e619f 100644 --- a/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src +++ b/lib/ic/test/java_client_erl_server_SUITE_data/Makefile.src @@ -66,8 +66,11 @@ CLASS_FILES = $(JAVA_FILES:.java=.class) ERL_FILES = $(GEN_ERL_FILES) m_i_impl.erl EBINS = $(ERL_FILES:.erl=.@EMULATOR@) - +@IFEQ@ (@jinterface_classpath@,) +all: +@ELSE all: $(CLASS_FILES) $(EBINS) +@ENDIF@ $(GEN_ERL_FILES) $(GEN_HRL_FILES): java_erl_test.built_erl $(GEN_JAVA_FILES): java_erl_test.built_java |