summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2016-06-28 22:10:06 +0200
committerTor Lillqvist <tml@collabora.com>2016-08-02 16:42:13 +0300
commita47cfcda2384bfa305c974983c27c8c0d5d74499 (patch)
tree67f76a1591dcc87a09ddac3b595dba4d864b10bb
parent79e1ff6d7786d4d23b90dd450c8fa79bba04b3c7 (diff)
gbuild: recognize newfangled screen TERM=screen.xterm-256color
Seems to have changed from Fedora 23, where it was just "screen", to 24. Change-Id: I9078c337093d12d62e9afe10b1f02aaf346d4b43 (cherry picked from commit 4dcba01d97b72db35885c505e647425059740a4c) Reviewed-on: https://gerrit.libreoffice.org/26766 Tested-by: Jenkins <ci@libreoffice.org> Reviewed-by: Caolán McNamara <caolanm@redhat.com> Tested-by: Caolán McNamara <caolanm@redhat.com> (cherry picked from commit 1ddc2f93c49660cf651f4faeb1f0f596eab953e2)
-rw-r--r--solenv/gbuild/Output.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index cd3682f361fc..64bea4e47333 100644
--- a/solenv/gbuild/Output.mk
+++ b/solenv/gbuild/Output.mk
@@ -62,6 +62,7 @@ KNOWN_TERM:=Eterm aterm gnome kterm linux putty rxvt rxvt-unicode screen xterm x
KNOWN_TERM+=$(patsubst %,%-color,$(KNOWN_TERM))
KNOWN_TERM+=$(patsubst %-color,%-256color,$(KNOWN_TERM))
KNOWN_TERM+=$(patsubst %-color,%+256color,$(KNOWN_TERM))
+KNOWN_TERM+=$(patsubst %,screen.%,$(KNOWN_TERM))
ifneq ($(strip $(gb_COLOR)),)
ifneq ($(filter $(TERM),$(KNOWN_TERM)),)