From 097fc9bdb386705a63a8021d5467266a70e22a6e Mon Sep 17 00:00:00 2001
From: "Rafael G. Martins" <rafael@rafaelmartins.eng.br>
Date: Thu, 10 May 2018 02:11:55 +0200
Subject: build: use predefined yatr project variables

---
 build-aux/build-static.sh   |  2 --
 build-aux/build-windows.sh  | 16 +++++++---------
 build-aux/clang-analyzer.sh |  4 +---
 3 files changed, 8 insertions(+), 14 deletions(-)

(limited to 'build-aux')

diff --git a/build-aux/build-static.sh b/build-aux/build-static.sh
index 39d6444..bf9cbf4 100755
--- a/build-aux/build-static.sh
+++ b/build-aux/build-static.sh
@@ -2,8 +2,6 @@
 
 set -ex
 
-PV="$(grep PACKAGE_VERSION config.h | cut -d\" -f2)"
-
 ${MAKE_CMD:-make} LDFLAGS="-all-static" blogc
 
 rm -rf root
diff --git a/build-aux/build-windows.sh b/build-aux/build-windows.sh
index 3ed6b59..b00fbe6 100755
--- a/build-aux/build-windows.sh
+++ b/build-aux/build-windows.sh
@@ -2,17 +2,15 @@
 
 set -ex
 
-PN="$(grep PACKAGE_TARNAME config.h | cut -d\" -f2)"
-PV="$(grep PACKAGE_VERSION config.h | cut -d\" -f2)"
-DEST_DIR="${PN}-${TARGET}-${PV}"
+DESTDIR="${PN}-${TARGET}-${PV}"
 
 ${MAKE_CMD:-make} blogc.exe
 
-rm -rf "${DEST_DIR}"
-mkdir -p "${DEST_DIR}"
+rm -rf "${DESTDIR}"
+mkdir -p "${DESTDIR}"
 
-cp .libs/blogc.exe "${DEST_DIR}/"
-cp ../LICENSE "${DEST_DIR}/"
-cp ../README.md "${DEST_DIR}/"
+cp .libs/blogc.exe "${DESTDIR}/"
+cp ../LICENSE "${DESTDIR}/"
+cp ../README.md "${DESTDIR}/"
 
-zip "${DEST_DIR}.zip" "${DEST_DIR}"/*
+zip "${DESTDIR}.zip" "${DESTDIR}"/*
diff --git a/build-aux/clang-analyzer.sh b/build-aux/clang-analyzer.sh
index 1582b10..e7820c4 100755
--- a/build-aux/clang-analyzer.sh
+++ b/build-aux/clang-analyzer.sh
@@ -2,15 +2,13 @@
 
 set -ex
 
-PN="$(grep PACKAGE_TARNAME config.h | cut -d\" -f2)"
-PV="$(grep PACKAGE_VERSION config.h | cut -d\" -f2)"
 P="${PN}-clang-analyzer-${PV}"
 
 set +e
 scan-build \
     --use-cc="${CC:-clang}" \
     -o reports \
-    ${MAKE_CMD:-make}
+    make
 RV=$?
 set -e
 
-- 
cgit v1.2.3-18-g5258