diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-01-06 21:28:17 +0100 |
|---|---|---|
| committer | Miklos Vajna <vmiklos@collabora.co.uk> | 2016-01-07 14:34:52 +0000 |
| commit | c173aba39c3e49f4c9b8f85d0c2ce08664a38f0f (patch) | |
| tree | c06456bcf591b6c1dbbacd3a2c9a3923d62af773 /pyuno | |
| parent | dcae0a5dba5aadc1e89828518102947f749db10e (diff) | |
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 <ci@libreoffice.org>
Tested-by: Tor Lillqvist <tml@collabora.com>
Reviewed-by: Tor Lillqvist <tml@collabora.com>
(cherry picked from commit e9cd5087366f930efd89a95c0a5610fe8f375581)
Reviewed-on: https://gerrit.libreoffice.org/21205
Reviewed-by: Miklos Vajna <vmiklos@collabora.co.uk>
Diffstat (limited to 'pyuno')
| -rw-r--r-- | pyuno/CustomTarget_zipcore.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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: |