diff options
| author | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2014-05-22 16:58:22 +0200 |
|---|---|---|
| committer | Christian Lohmaier <lohmaier+LibreOffice@googlemail.com> | 2014-05-23 00:28:48 +0200 |
| commit | cf3a3bfa560d293a7c15fed56221f7c3b3d4b8f5 (patch) | |
| tree | 8715c13ceea93ea2995a6b192e110913e6a08e31 | |
| parent | bedf2134f78ef0c6d0117d3c29272047d90bcce3 (diff) | |
use $(gb_AWK) instead of awk
but only where available, revert the change in Output.mk
(cherry picked from commit 87c1aa16a95dcff9247ae12a4bb5ea2d866b1772)
Change-Id: Ia00d7e52de5edfce09c3a0a8aa4390e3e1582a01
| -rw-r--r-- | external/python3/ExternalProject_python3.mk | 2 | ||||
| -rw-r--r-- | postprocess/CustomTarget_registry.mk | 8 | ||||
| -rw-r--r-- | sysui/CustomTarget_deb.mk | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/external/python3/ExternalProject_python3.mk b/external/python3/ExternalProject_python3.mk index 1f7be7ffda57..0bbd9b5f27bf 100644 --- a/external/python3/ExternalProject_python3.mk +++ b/external/python3/ExternalProject_python3.mk @@ -109,7 +109,7 @@ $(call gb_ExternalProject_get_state_target,python3,fixscripts) : $(call gb_Exter $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)-config \ $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/python$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)m-config \ $(python3_fw_prefix)/Versions/$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR)/bin/pyvenv-$(PYTHON_VERSION_MAJOR).$(PYTHON_VERSION_MINOR) ; do \ - { rm "$$file" && awk '\ + { rm "$$file" && $(gb_AWK) '\ BEGIN {print "#!/bin/bash\n\ origpath=$$(pwd)\n\ bindir=$$(cd $$(dirname \"$$0\") ; pwd)\n\ diff --git a/postprocess/CustomTarget_registry.mk b/postprocess/CustomTarget_registry.mk index 0bc71a98b730..2ae4ab62a5ab 100644 --- a/postprocess/CustomTarget_registry.mk +++ b/postprocess/CustomTarget_registry.mk @@ -594,17 +594,17 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/Langpack-%.list : # zero-sized org/openoffice/TypeDectection/Filter.xcu; filter them out in the # find shell command below (see issue 110041): $(call gb_CustomTarget_get_workdir,postprocess/registry)/fcfg_langpack_%.list : - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2) + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AWK,2) $(call gb_Helper_abbreviate_dirs,\ find $(call gb_XcuResTarget_get_target,fcfg_langpack/$*/)\ -name *.xcu -size +0c \ - | awk 'BEGIN{print "<list>"} \ + | $(gb_AWK) 'BEGIN{print "<list>"} \ {print "<filename>"$$0"</filename>"} \ END {print "</list>"}' > $@ \ ) $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list : - $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),ECH,2) + $(call gb_Output_announce,$(subst $(WORKDIR)/,,$@),$(true),AWK,2) $(call gb_Helper_abbreviate_dirs,\ find $(call gb_XcuResTarget_get_target,registry/$*/)\ $(if $(filter DBCONNECTIVITY,$(BUILD_TYPE)),\ @@ -613,7 +613,7 @@ $(call gb_CustomTarget_get_workdir,postprocess/registry)/registry_%.list : $(if $(filter TRUE,$(ENABLE_ONLINE_UPDATE)),\ $(call gb_XcuResTarget_get_target,updchk/$*/))\ -name *.xcu \ - | awk 'BEGIN{print "<list>"} \ + | $(gb_AWK) 'BEGIN{print "<list>"} \ {print "<filename>"$$0"</filename>"} \ END {print "</list>"}' > $@ \ ) diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk index 82acd327843b..ea68e2fad6e4 100644 --- a/sysui/CustomTarget_deb.mk +++ b/sysui/CustomTarget_deb.mk @@ -57,7 +57,7 @@ $(deb_WORKDIR)/%/DEBIAN/control: $(deb_SRCDIR)/control $(call gb_CustomTarget_ge sed 's/%productname/$(PRODUCTNAME.$*) $(PRODUCTVERSION)/' \ >> $@ echo "Version: $(PKGVERSION)-$(LIBO_VERSION_PATCH)" >>$@ - du -k -s $(deb_WORKDIR)/$* | awk -F ' ' '{ printf "Installed-Size: %s\n", $$1 ; }' >>$@ + du -k -s $(deb_WORKDIR)/$* | $(gb_AWK) -F ' ' '{ printf "Installed-Size: %s\n", $$1 ; }' >>$@ $(deb_WORKDIR)/%$(PKGVERSIONSHORT)-debian-menus_$(PKGVERSION)-$(LIBO_VERSION_PATCH)_all.deb: $(deb_WORKDIR)/%/DEBIAN/postrm $(deb_WORKDIR)/%/DEBIAN/postinst $(deb_WORKDIR)/%/DEBIAN/prerm $(deb_WORKDIR)/%/DEBIAN/control $(call gb_Library_get_target,getuid) |