From e18f93945a4d84bab7e1fb21db4d641d834b3948 Mon Sep 17 00:00:00 2001
From: Boris Pek <tehnick-8@yandex.ru>
Date: Thu, 30 Mar 2017 07:48:43 +0300
Subject: [PATCH] qca: cosmetic changes

---
 src/qca-test.cmake |  1 -
 src/qca.mk         | 15 +++++++--------
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/src/qca-test.cmake b/src/qca-test.cmake
index 05b95667..00f9d2d2 100644
--- a/src/qca-test.cmake
+++ b/src/qca-test.cmake
@@ -19,4 +19,3 @@ if(BUILD_STATIC_LIBS)
 endif(BUILD_STATIC_LIBS)
 
 install(TARGETS ${TGT} DESTINATION bin)
-
diff --git a/src/qca.mk b/src/qca.mk
index 65b8bc7b..e8f176be 100644
--- a/src/qca.mk
+++ b/src/qca.mk
@@ -21,17 +21,17 @@ define $(PKG)_BUILD
     $(MAKE) -C '$(BUILD_DIR)' -j 1 install
 
     # build test as qmake project
-    mkdir '$(BUILD_DIR)/test-qca'
-    cd '$(BUILD_DIR)/test-qca' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qca-test.pro'
-    $(MAKE) -C '$(BUILD_DIR)/test-qca' -j $(JOBS) $(BUILD_TYPE)
-    $(INSTALL) -m755 '$(BUILD_DIR)/test-qca/$(BUILD_TYPE)/test-qca-qmake.exe' '$(PREFIX)/$(TARGET)/bin/'
+    mkdir '$(BUILD_DIR).test-qmake'
+    cd '$(BUILD_DIR).test-qmake' && '$(PREFIX)/$(TARGET)/qt5/bin/qmake' '$(PWD)/src/qca-test.pro'
+    $(MAKE) -C '$(BUILD_DIR).test-qmake' -j 1
+    $(INSTALL) -m755 '$(BUILD_DIR).test-qmake/$(BUILD_TYPE)/test-qca-qmake.exe' '$(PREFIX)/$(TARGET)/bin/'
 
     # build test as cmake project
-    mkdir '$(1).test-cmake'
-    cd '$(1).test-cmake' && $(TARGET)-cmake \
+    mkdir '$(BUILD_DIR).test-cmake'
+    cd '$(BUILD_DIR).test-cmake' && $(TARGET)-cmake \
         -DPKG=$(PKG) \
         '$(PWD)/src/cmake/test'
-    $(MAKE) -C '$(1).test-cmake' -j 1 install VERBOSE=ON
+    $(MAKE) -C '$(BUILD_DIR).test-cmake' -j 1 install VERBOSE=ON
 
     # build test manually
     '$(TARGET)-g++' \
@@ -41,4 +41,3 @@ define $(PKG)_BUILD
         $(if $(BUILD_STATIC), -L'$(PREFIX)/$(TARGET)/qt5/plugins/crypto' -lqca-ossl) \
         `'$(TARGET)-pkg-config' qca2-qt5 --cflags --libs`
 endef
-