[libreoffice] 04/05: make tests/patches/odk-build-examples-standalone.diff apply again

[Rene Engelhard]

This is an automated email from the git hooks/post-receive script.

rene pushed a commit to branch debian-experimental-6.0
in repository libreoffice.

commit 539d9e590c9b7ec36330f2454d276cb1ce4666fd
Author: Rene Engelhard <rene at debian.org>
Date:   Sun Oct 15 13:49:39 2017 +0200

    make tests/patches/odk-build-examples-standalone.diff apply again
---
 tests/patches/odk-build-examples-standalone.diff | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/patches/odk-build-examples-standalone.diff b/tests/patches/odk-build-examples-standalone.diff
index 0cdf4bd..433b69c 100644
--- a/tests/patches/odk-build-examples-standalone.diff
+++ b/tests/patches/odk-build-examples-standalone.diff
@@ -2,15 +2,15 @@ diff --git a/odk/CustomTarget_build-examples.mk b/odk/CustomTarget_build-example
 index 89e427348087..1aa4d766823f 100644
 --- a/odk/CustomTarget_build-examples.mk
 +++ b/odk/CustomTarget_build-examples.mk
-@@ -96,7 +95,7 @@ $(call gb_CustomTarget_get_target,odk/build-examples): \
+@@ -104,7 +104,7 @@ endif
          && export \
              UserInstallation=$(call gb_Helper_make_url,$(call gb_CustomTarget_get_workdir,odk/build-examples)/user) \
          $(foreach my_dir,$(my_example_dirs), \
 -            && (cd $(INSTDIR)/$(SDKDIRNAME)/examples/$(my_dir) \
 +            && (cd /usr/lib/libreoffice/sdk/examples/$(my_dir) \
-                 && printf 'yes\n' | LC_ALL=C make))) \
+                 && printf 'yes\n' | LC_ALL=C make \
+                     $(if $(filter MACOSX,$(OS)), SHELL=$(ODK_BUILD_SHELL), )))) \
              >$(call gb_CustomTarget_get_workdir,odk/build-examples)/log 2>&1 \
-         || (RET=$$? \
 @@ -104,17 +103,17 @@ $(call gb_CustomTarget_get_target,odk/build-examples): \
              && exit $$RET)
  

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/libreoffice.git