[Libreoffice-commits] core.git: Branch 'libreoffice-5-1' - solenv/gbuild

[Michael Stahl]

 solenv/gbuild/Output.mk |    1 +
 1 file changed, 1 insertion(+)

New commits:
commit 1ddc2f93c49660cf651f4faeb1f0f596eab953e2
Author: Michael Stahl <mstahl at redhat.com>
Date:   Tue Jun 28 22:10:06 2016 +0200

    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 at libreoffice.org>
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/solenv/gbuild/Output.mk b/solenv/gbuild/Output.mk
index cd3682f..64bea4e 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)),)