external/python3/ExternalProject_python3.mk | 2 +-
postprocess/CustomTarget_registry.mk | 8 ++++----
solenv/gbuild/Output.mk | 4 ++--
sysui/CustomTarget_deb.mk | 2 +-
4 files changed, 8 insertions(+), 8 deletions(-)
New commits:
commit 87c1aa16a95dcff9247ae12a4bb5ea2d866b1772
Author: Christian Lohmaier <lohmaier+libreoff...@googlemail.com>
Date: Thu May 22 16:58:22 2014 +0200
use $(gb_AWK) instead of awk
Change-Id: Ia00d7e52de5edfce09c3a0a8aa4390e3e1582a01
diff --git a/external/python3/ExternalProject_python3.mk
b/external/python3/ExternalProject_python3.mk
index 1f7be7f..0bbd9b5 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 0bc71a9..2ae4ab6 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/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index ca3da3b..01e9ad2 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -45,8 +45,8 @@ define gb_Output_warn
$(warning $(NEWLINE)[WARN $(2)] !!!$(NEWLINE)[WARN $(2)] !!!
$(1)$(NEWLINE)[WARN $(2)] !!!)
endef
-gb_Output_ESCAPE := $(shell echo|awk 'BEGIN { printf "%c", 27 }' -)
-gb_Output_BELL := $(shell echo|awk 'BEGIN { printf "%c", 7 }' -)
+gb_Output_ESCAPE := $(shell echo|$(gb_AWK) 'BEGIN { printf "%c", 27 }' -)
+gb_Output_BELL := $(shell echo|$(gb_AWK) 'BEGIN { printf "%c", 7 }' -)
# only enable colorized output if
# - gb_COLOR is set
diff --git a/sysui/CustomTarget_deb.mk b/sysui/CustomTarget_deb.mk
index 82acd32..ea68e2f 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)
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
