From a7af253aa47667f6b08e899c3722d150a7f2eb4c Mon Sep 17 00:00:00 2001
From: Blaise Tine <tinebp@yahoo.com>
Date: Sat, 19 Sep 2020 16:25:44 -0400
Subject: [PATCH] minor update

---
 ci/prebuilt.sh | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/ci/prebuilt.sh b/ci/prebuilt.sh
index 15fc303d..f51727a7 100755
--- a/ci/prebuilt.sh
+++ b/ci/prebuilt.sh
@@ -1,18 +1,13 @@
 #!/bin/bash
 
-RISCVTOOL_SRCDIR=/opt/riscv-gnu-toolchain
-POCL_SRCDIR=/opt/pocl
-LLVM_SRCDIR=/opt/llvm-riscv
-VERILATOR_SRCDIR=/opt/verilator
-
 OS_DIR=ubuntu/bionic
-
+SRCDIR=/opt
 DESTDIR=.
 
 riscv() 
 {
     echo "prebuilt riscv-gnu-toolchain..."
-    tar -cvjf riscv-gnu-toolchain.tar.bz2 $RISCVTOOL_SRCDIR
+    tar -cvjf -C $SRCDIR riscv-gnu-toolchain.tar.bz2 riscv-gnu-toolchain
     split -b 50M riscv-gnu-toolchain.tar.bz2 "riscv-gnu-toolchain.tar.bz2.part"    
     mv riscv-gnu-toolchain.tar.bz2.part* $DESTDIR/riscv-gnu-toolchain/$OS_DIR
     rm riscv-gnu-toolchain.tar.bz2
@@ -21,7 +16,7 @@ riscv()
 llvm() 
 {
     echo "prebuilt llvm-riscv..."
-    tar -cvjf llvm-riscv.tar.bz2 $LLVM_SRCDIR
+    tar -cvjf -C $SRCDIR llvm-riscv.tar.bz2 llvm-riscv
     split -b 50M llvm-riscv.tar.bz2 "llvm-riscv.tar.bz2.part"    
     mv llvm-riscv.tar.bz2.part* $DESTDIR/llvm-riscv/$OS_DIR
     rm llvm-riscv.tar.bz2
@@ -30,14 +25,14 @@ llvm()
 pocl() 
 {
     echo "prebuilt pocl..."
-    tar -cvjf pocl.tar.bz2 $POCL_SRCDIR
+    tar -cvjf -C $SRCDIR pocl.tar.bz2 pocl
     mv pocl.tar.bz2 $DESTDIR/pocl/$OS_DIR
 }
 
 verilator() 
 {
     echo "prebuilt verilator..."
-    tar -cvjf verilator.tar.bz2 $VERILATOR_SRCDIR
+    tar -cvjf -C $SRCDIR verilator.tar.bz2 verilator
     mv verilator.tar.bz2 $DESTDIR/verilator/$OS_DIR
 }