aboutsummaryrefslogtreecommitdiffstats
path: root/ui
diff options
context:
space:
mode:
authorGuy Harris <guy@alum.mit.edu>2016-06-28 17:24:19 -0700
committerGuy Harris <guy@alum.mit.edu>2016-06-29 00:24:53 +0000
commit07570b58311588dbe10014c581a2eda1f5440b48 (patch)
tree4086d20185e4a7daee40d1b9eb11fd28e372bb21 /ui
parent5c03bda31af87bf08a404509cd0714df65471416 (diff)
Don't assume GNU sed.
Not all versions of sed support "\n" as meaning "newline" in the replacement string of an s command. POSIX requires tr to support "\n" in the replacement string, however, so use % as meaning "newline" in the sed script, and translate it to a newline using tr. Change-Id: Icdbc0b55787340953dfc90ea82e0421b4e77a896 Reviewed-on: https://code.wireshark.org/review/16199 Reviewed-by: Guy Harris <guy@alum.mit.edu>
Diffstat (limited to 'ui')
-rw-r--r--ui/qt/Makefile.am4
1 files changed, 2 insertions, 2 deletions
diff --git a/ui/qt/Makefile.am b/ui/qt/Makefile.am
index c495f91c23..8ae25a71a9 100644
--- a/ui/qt/Makefile.am
+++ b/ui/qt/Makefile.am
@@ -162,8 +162,8 @@ i18n_qresource := $(foreach qm, $(QM_FILES),<file>$(qm)</file>)
i18n.qrc: i18n.qrc.in $(QM_FILES)
$(AM_V_SED)$(SED) \
-e 's,@i18n_qresource\@,$(i18n_qresource),' \
- -e 's,> *<file>,>\n <file>,g' \
- < $< > $@
+ -e 's,> *<file>,>% <file>,g' \
+ < $< | tr '%' '\n' > $@
#
# Explicit dependencies to force the ui_ headers to be built.