diff options
| author | Michael Stahl <mstahl@redhat.com> | 2016-01-06 21:28:17 +0100 |
|---|---|---|
| committer | Tor Lillqvist <tml@collabora.com> | 2016-01-07 08:44:28 +0000 |
| commit | e9cd5087366f930efd89a95c0a5610fe8f375581 (patch) | |
| tree | 77e83e7d88a8f6cf4a485b5f70686588661bc7a8 /postprocess | |
| parent | 2e11a3e03ed37eb86cd87f68191c48d2a6e442cb (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>
Diffstat (limited to 'postprocess')
| -rw-r--r-- | postprocess/CustomTarget_images.mk | 6 | ||||
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/postprocess/CustomTarget_images.mk b/postprocess/CustomTarget_images.mk index de2c21d1f3dd..d86b6009d6f8 100644 --- a/postprocess/CustomTarget_images.mk +++ b/postprocess/CustomTarget_images.mk @@ -55,10 +55,10 @@ $(packimages_DIR)/%.zip : \ $(packimages_DIR)/commandimagelist.ilst : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),PRL,1) $(call gb_Helper_abbreviate_dirs, \ - find $(SRCDIR)/icon-themes -name "*.png" -o -name "*.svg" | \ - grep -e '/cmd/' | sed 's#^.*/icon-themes/[^/]*##' | sort | uniq | \ + $(FIND) $(SRCDIR)/icon-themes -name "*.png" -o -name "*.svg" | \ + grep -e '/cmd/' | sed 's#^.*/icon-themes/[^/]*##' | $(SORT) | uniq | \ sed "s#^#%MODULE%#" | \ - LC_ALL=C sort > $@.tmp && \ + LC_ALL=C $(SORT) > $@.tmp && \ $(PERL) $(SRCDIR)/solenv/bin/diffmv.pl $@.tmp $@ \ $(if $(findstring s,$(MAKEFLAGS)),2> /dev/null)) diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 7992a4e90901..6a9e2d19e457 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -579,7 +579,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list : $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AWK,2) $(call gb_Helper_abbreviate_dirs,\ - find $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/)\ + $(FIND) $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/) \ -name *.xcu -size +0c \ | $(gb_AWK) 'BEGIN{print "<list>"} \ {print "<filename>"$$0"</filename>"} \ @@ -589,7 +589,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list : $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list : $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AWK,2) $(call gb_Helper_abbreviate_dirs,\ - find $(call gb_XcuResTarget_get_target,registry/$*/)\ + $(FIND) $(call gb_XcuResTarget_get_target,registry/$*/) \ $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\ $(foreach driver,$(postprocess_DRIVERS),\ $(call gb_XcuResTarget_get_target,$(driver)/$*/)))\ |