diff options
| author | Miklos Vajna <vmiklos@collabora.com> | 2021-08-02 21:02:15 +0200 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.com> | 2021-08-03 08:33:04 +0200 |
| commit | c5c996578a62afda92fbf6211e9c9169167cc410 (patch) | |
| tree | 872bf53c3a58d977ffcd01114d52ba9dd187b26b /Makefile.in | |
| parent | 0c7cc718cd952e39957037e7fda3ac96e32b6d61 (diff) | |
Fix 'make test-install' on Linux
Regression from commit af70b5b8aa7b9dac3b64ef58968208475f673f5c (Allow
--enable-macosx-sandbox without the codesigning identities, 2020-11-19),
which started to assume that non-Windows means macOS for test-install
purposes.
Change-Id: If3c281b330363eb9c853ce6193e09698835ed765
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/119908
Tested-by: Jenkins
Reviewed-by: Miklos Vajna <vmiklos@collabora.com>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.in b/Makefile.in index a2b34f80088a..ed35e52af8d5 100644 --- a/Makefile.in +++ b/Makefile.in @@ -358,6 +358,7 @@ ifeq ($(OS_FOR_BUILD),WNT) cd $(SRCDIR)/instsetoo_native && $(MAKE) LIBO_TEST_INSTALL=TRUE $(GMAKE_OPTIONS) else @$(SRCDIR)/solenv/bin/ooinstall $(TESTINSTALLDIR) +ifeq ($(OS),MACOSX) # # Create Resources/*.lproj directories for languages supported by macOS set -x; for lang in ca cs da de el en es fi fr hr hu id it ja ko ms nl no pl pt pt_PT ro ru sk sv th tr uk vi zh_CN zh_TW; do \ @@ -391,6 +392,7 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),) @$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle $(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app endif endif +endif @$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR)) mac-app-store-package: test-install |