diff options
| author | Stephan Bergmann <sbergman@redhat.com> | 2018-04-30 15:00:14 +0200 |
|---|---|---|
| committer | Stephan Bergmann <sbergman@redhat.com> | 2018-04-30 15:01:16 +0200 |
| commit | 809d59534f519b55d8d55bc03ef35264a2ffe329 (patch) | |
| tree | 0dc224075671dc8893835acd7e477053239d363a | |
| parent | 7c112da22428ea56045f24911854a5569bd851df (diff) | |
Fix quoting
...broken with d3fd9d026592a7c180f2abf763c618624fe016e7 "split
odk/build-examples Java tests out into a build-examples_java test"
Change-Id: I0bc403e76969bf636a9ba76a7cd40cb895fc3000
| -rw-r--r-- | odk/build-examples_common.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/odk/build-examples_common.mk b/odk/build-examples_common.mk index c465d01fc72b..931d6eea856e 100644 --- a/odk/build-examples_common.mk +++ b/odk/build-examples_common.mk @@ -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 |