[Libreoffice-commits] core.git: Makefile.in

[Miklos Vajna (via logerrit)]

 Makefile.in |    2 ++
 1 file changed, 2 insertions(+)

New commits:
commit c5c996578a62afda92fbf6211e9c9169167cc410
Author:     Miklos Vajna <vmiklos at collabora.com>
AuthorDate: Mon Aug 2 21:02:15 2021 +0200
Commit:     Miklos Vajna <vmiklos at collabora.com>
CommitDate: Tue Aug 3 08:33:04 2021 +0200

    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 at collabora.com>

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 \
@@ -390,6 +391,7 @@ ifneq ($(MACOSX_CODESIGNING_IDENTITY),)
 # Then use the macosx-codesign-app-bundle script
 	@$(SRCDIR)/solenv/bin/macosx-codesign-app-bundle $(TESTINSTALLDIR)/$(PRODUCTNAME_WITHOUT_SPACES).app
 endif
+endif
 endif
 	@$(call gb_Top_InstallFinished,Test Installation,$(TESTINSTALLDIR))