Kaydet (Commit) 809d5953 authored tarafından Stephan Bergmann's avatar Stephan Bergmann

Fix quoting

...broken with d3fd9d02 "split
odk/build-examples Java tests out into a build-examples_java test"

Change-Id: I0bc403e76969bf636a9ba76a7cd40cb895fc3000
üst 7c112da2
......@@ -23,9 +23,9 @@ ifeq (MACOSX,$(OS))
cp /bin/sh "$(ODK_BUILD_SHELL)"
chmod 0700 "$(ODK_BUILD_SHELL)"
endif
(saved_library_path=$${$(gb_Helper_LIBRARY_PATH_VAR)} && . $$< \
(saved_library_path=$$$${$(gb_Helper_LIBRARY_PATH_VAR)} && . $$< \
$(if $(filter MACOSX,$(OS)),, \
&& $(gb_Helper_LIBRARY_PATH_VAR)=$$saved_library_path) \
&& $(gb_Helper_LIBRARY_PATH_VAR)=$$$$saved_library_path) \
&& export \
UserInstallation=$(call gb_Helper_make_url,$(call gb_CustomTarget_get_workdir,$(1))/user) \
$(foreach my_dir,$(2), \
......@@ -33,10 +33,10 @@ endif
&& printf 'yes\n' | LC_ALL=C make \
$(if $(filter MACOSX,$(OS)), SHELL=$(ODK_BUILD_SHELL), )))) \
>$(call gb_CustomTarget_get_workdir,$(1))/log 2>&1 \
|| (RET=$$? \
|| (RET=$$$$? \
$(if $(filter MACOSX,$(OS)), && rm -f $(ODK_BUILD_SHELL) , ) \
&& cat $(call gb_CustomTarget_get_workdir,$(1))/log \
&& exit $$RET)
&& exit $$$$RET)
ifeq (MACOSX,$(OS))
-rm -f $(ODK_BUILD_SHELL)
endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment