From 7d83006e3345be8cd707a3551f700c0a7e65a2bc Mon Sep 17 00:00:00 2001
From: "Koenig, Joerg" <Joerg.Koenig@techsat.com>
Date: Tue, 28 Apr 2020 08:48:34 +0200
Subject: User regular bin folder for linux binaries

Change-Id: I1be7e6ccf5a43a5475f311e6003a68263c63fe5a
---
 Jenkinsfile | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 8dd3a0a..d8b5015 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -141,11 +141,10 @@ stage ("Post processing") {
 	    tar -xzf $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz -C $WORKSPACE/INST/$QT_VER/x86-mingw64
 	    rm -f $WORKSPACE/qt-$QT_VER-x86-mingw64.tgz
 	    cp -f $WORKSPACE/qt.conf $WORKSPACE/INST/$QT_VER/x86-mingw64/bin
-	    mkdir -p $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin
-	    cp -f $WORKSPACE/INST/$QT_VER/x86-linux64-static/bin/* $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin
-	    rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/linguist
-	    rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/designer
-	    rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/xbin/assistant
+	    cp -f $WORKSPACE/INST/$QT_VER/x86-linux64-static/bin/* $WORKSPACE/INST/$QT_VER/x86-mingw64/bin
+	    rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/linguist
+	    rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/designer
+	    rm -f $WORKSPACE/INST/$QT_VER/x86-mingw64/bin/assistant
 
 	    mkdir -p $WORKSPACE/INST/$QT_VER/x86_64-msvc
 	    unzip -qo $WORKSPACE/qt-$QT_VER-x86_64-msvc.zip -d $WORKSPACE/INST/$QT_VER/x86_64-msvc
-- 
cgit v0.12