From a87fbdf0a86cfa410c79671aee931e3bf95fab11 Mon Sep 17 00:00:00 2001 From: Sebastian Thiel Date: Sat, 14 Mar 2015 13:28:01 +0100 Subject: [PATCH] fix(travis): try using a subshell for cargo cmd Apparently travis doesn't execute cargo in the right sub-directory. Might be a difference in the way make works Related to #8 --- src/mako/deps.mako | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mako/deps.mako b/src/mako/deps.mako index a55e4103b0..0f9674b98a 100644 --- a/src/mako/deps.mako +++ b/src/mako/deps.mako @@ -62,7 +62,7 @@ ${gen_root_stamp}: ${' '.join(i[0] for i in sds)} ${api_json_inputs} $(MAKO_STAN ${api_name}: ${api_common} ${api_cargo}: ${api_name} - cd ${gen_root} && cargo $(ARGS) + (cd ${gen_root} && cargo $(ARGS)) ${api_doc_index}: ${api_name} cd ${gen_root} && cargo doc @@ -85,6 +85,7 @@ apis: ${space_join(0)} ${doc_index}: ${' '.join(central_api_index(a[0]) for a in api_info)} $(MAKO_STANDARD_DEPENDENCIES) $(MAKO) --var DOC_ROOT=${doc_root} -io $(MAKO_SRC)/index.html.mako=$@ --data-files $(API_SHARED_INFO) $(API_LIST) + @echo Documentation index created at '$@' docs: ${doc_index} docs-clean: