From e9cd5087366f930efd89a95c0a5610fe8f375581 Mon Sep 17 00:00:00 2001 From: Michael Stahl Date: Wed, 6 Jan 2016 21:28:17 +0100 Subject: configure: hard-code /usr/bin/{sort,find} for Cygwin ... to avoid calling C:/Windows/system32/{sort,find}.exe, if those happen to be first in PATH. On a Windows 7 system, the other conflicts appear to be harmless, we don't use "more", "expand", "timeout", "whoami". Change-Id: Iceefeb7ee6725291b04c0eba465991bb1df96b57 Reviewed-on: https://gerrit.libreoffice.org/21175 Tested-by: Jenkins Tested-by: Tor Lillqvist Reviewed-by: Tor Lillqvist --- pyuno/CustomTarget_zipcore.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pyuno') diff --git a/pyuno/CustomTarget_zipcore.mk b/pyuno/CustomTarget_zipcore.mk index 0efd83093ac3..42b37a831b04 100644 --- a/pyuno/CustomTarget_zipcore.mk +++ b/pyuno/CustomTarget_zipcore.mk @@ -29,6 +29,6 @@ $(call gb_CustomTarget_get_workdir,pyuno/zipcore)/$(pyuno_PYTHON_ARCHIVE_NAME) \ : $(call gb_ExternalPackage_get_target,python3) \ | $(call gb_CustomTarget_get_workdir,pyuno/zipcore)/.dir $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ZIP,1) - cd $(pyuno_PYTHON_LIB_DIR) && zip -q $@ $(shell cd $(pyuno_PYTHON_LIB_DIR) && find . -type f | grep -v "\.pyc" | grep -v "\.py~" | grep -v .orig | grep -v _failed) + cd $(pyuno_PYTHON_LIB_DIR) && zip -q $@ $(shell cd $(pyuno_PYTHON_LIB_DIR) && $(FIND) . -type f | grep -v "\.pyc" | grep -v "\.py~" | grep -v .orig | grep -v _failed) # vim: set noet sw=4 ts=4: -- cgit