From 05e6185f7740f3acef556ba39cff95139bd7130d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lucio=20Andr=C3=A9s=20Illanes=20Albornoz=20=28arab=2C=20vx?=
 =?UTF-8?q?p=29?= <l.illanes@gmx.de>
Date: Mon, 6 Feb 2017 01:20:04 +0100
Subject: build.sh, {subr,vars}/*: general cleanup.

---
 vars/cmake.vars | 56 ++++++++++++++++++++++++++++----------------------------
 1 file changed, 28 insertions(+), 28 deletions(-)

(limited to 'vars/cmake.vars')

diff --git a/vars/cmake.vars b/vars/cmake.vars
index bbcfacb6..ceee8157 100644
--- a/vars/cmake.vars
+++ b/vars/cmake.vars
@@ -3,36 +3,36 @@
 #
 
 pkg_cmake_configure() {
-	build_fileop cp ../cmake-${PKG_VERSION}/Modules/Platform/BSDOS.cmake \
-		../cmake-${PKG_VERSION}/Modules/Platform/Midipix.cmake;
-	build_fileop rm ../cmake-${PKG_VERSION}-host;
-	build_fileop mkdir ../cmake-${PKG_VERSION}-host;
-	build_fileop cd ../cmake-${PKG_VERSION}-host;
+	build_fileop cp "../cmake-${PKG_VERSION}/Modules/Platform/BSDOS.cmake" \
+		"../cmake-${PKG_VERSION}/Modules/Platform/Midipix.cmake";
+	build_fileop rm "../cmake-${PKG_VERSION}-host";
+	build_fileop mkdir "../cmake-${PKG_VERSION}-host";
+	build_fileop cd "../cmake-${PKG_VERSION}-host";
 	log_msg info "Bootstrapping cmake...";
 	(unset AR CC CXX RANLIB;
-	 ../cmake-${PKG_VERSION}/configure ${PKG_CONFIGURE_ARGS};
-	 make ${DEFAULT_MAKEFLAGS_BUILD} DESTDIR=${PREFIX} install);
+	 "../cmake-${PKG_VERSION}/configure" ${PKG_CONFIGURE_ARGS};
+	 make ${DEFAULT_MAKEFLAGS_BUILD} "DESTDIR=${PREFIX}" install);
 	log_msg info "Finished bootstrapping cmake.";
-	stat ../cmake-${PKG_VERSION};
+	stat "../cmake-${PKG_VERSION}";
 };
 
 pkg_cmake_build() {
 	local _prefix;
-	build_fileop rm ../cmake-${PKG_VERSION}-native-${PKG_TARGET};
-	build_fileop mkdir ../cmake-${PKG_VERSION}-native-${PKG_TARGET};
-	build_fileop cd ${WORKDIR}/cmake-${PKG_VERSION}-native-${PKG_TARGET};
+	build_fileop rm "../cmake-${PKG_VERSION}-native-${PKG_TARGET}";
+	build_fileop mkdir "../cmake-${PKG_VERSION}-native-${PKG_TARGET}";
+	build_fileop cd "${WORKDIR}/cmake-${PKG_VERSION}-native-${PKG_TARGET}";
 	rm -f config.cache;
 	log_msg info "Calling cmake...";
-	_prefix=${PREFIX};
+	_prefix="${PREFIX}";
 	env	CFLAGS="-L${PKG_PREFIX}/lib --sysroot=${PKG_PREFIX}"		\
 		PREFIX="" cmake							\
-		-DBZIP2_INCLUDE_DIR=${PKG_PREFIX}/include			\
-		-DBZIP2_LIBRARIES=${PKG_PREFIX}/lib/libbz2.a			\
-		-DCMAKE_AR=${_prefix}/bin/${AR}					\
-		-DCMAKE_C_COMPILER=${_prefix}/bin/${CC}				\
-		-DCMAKE_CXX_COMPILER=${_prefix}/bin/${PKG_TARGET}-g++		\
+		-DBZIP2_INCLUDE_DIR="${PKG_PREFIX}/include"			\
+		-DBZIP2_LIBRARIES="${PKG_PREFIX}/lib/libbz2.a"			\
+		-DCMAKE_AR="${_prefix}/bin/${AR}"				\
+		-DCMAKE_C_COMPILER="${_prefix}/bin/${CC}"			\
+		-DCMAKE_CXX_COMPILER="${_prefix}/bin/${PKG_TARGET}-g++"		\
 		-DCMAKE_INSTALL_PREFIX=						\
-		-DCMAKE_RANLIB=${_prefix}/bin/${RANLIB}				\
+		-DCMAKE_RANLIB="${_prefix}/bin/${RANLIB}"			\
 		-DCMAKE_SYSTEM_NAME=Midipix					\
 		-DCMAKE_USE_SYSTEM_BZIP2=ON					\
 		-DCMAKE_USE_SYSTEM_CURL=ON					\
@@ -40,20 +40,20 @@ pkg_cmake_build() {
 		-DCMAKE_USE_SYSTEM_LIBARCHIVE=ON				\
 		-DCMAKE_USE_SYSTEM_ZLIB=ON					\
 		-DCMAKE_VERBOSE_MAKEFILE=ON					\
-		-DCURL_INCLUDE_DIR=${PKG_PREFIX}/include/curl			\
-		-DCURL_LIBRARY=${PKG_PREFIX}/lib/libcurl.lib.a			\
-		-DCURSES_NCURSES_LIBRARY=${PKG_PREFIX}/lib/libncurses.so	\
+		-DCURL_INCLUDE_DIR="${PKG_PREFIX}/include/curl"			\
+		-DCURL_LIBRARY="${PKG_PREFIX}/lib/libcurl.lib.a"		\
+		-DCURSES_NCURSES_LIBRARY="${PKG_PREFIX}/lib/libncurses.so"	\
 		-DKWSYS_LFS_WORKS=YES						\
-		-DLibArchive_INCLUDE_DIR=${PKG_PREFIX}/include			\
-		-DLibArchive_LIBRARY=${PKG_PREFIX}/lib/libarchive.lib.a		\
+		-DLibArchive_INCLUDE_DIR="${PKG_PREFIX}/include"		\
+		-DLibArchive_LIBRARY="${PKG_PREFIX}/lib/libarchive.lib.a"	\
 		-DLIBLZMA_HAS_AUTO_DECODER=YES					\
 		-DLIBLZMA_HAS_EASY_ENCODER=YES					\
 		-DLIBLZMA_HAS_LZMA_PRESET=YES					\
-		-DLIBLZMA_INCLUDE_DIR=${PKG_PREFIX}/include			\
-		-DLIBLZMA_LIBRARY=${PKG_PREFIX}/lib/liblzma.lib.a		\
-		-DZLIB_INCLUDE_DIR=${PKG_PREFIX}/include 			\
-		-DZLIB_LIBRARY=${PKG_PREFIX}/lib/libz.a				\
-			../cmake-${PKG_VERSION};
+		-DLIBLZMA_INCLUDE_DIR="${PKG_PREFIX}/include"			\
+		-DLIBLZMA_LIBRARY="${PKG_PREFIX}/lib/liblzma.lib.a"		\
+		-DZLIB_INCLUDE_DIR="${PKG_PREFIX}/include"			\
+		-DZLIB_LIBRARY="${PKG_PREFIX}/lib/libz.a"			\
+			"../cmake-${PKG_VERSION}";
 	log_msg info "Calling make...";
 	make ${DEFAULT_MAKEFLAGS_BUILD};
 };
-- 
cgit v1.2.3