--- trunk/include/cmake.sminc	2017/10/27 08:58:33	30125
+++ trunk/include/cmake.sminc	2019/10/21 10:08:11	33242
@@ -163,10 +163,14 @@
 		[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
 		for abi in ${abis_to_run}
 		do
-			cd ${BUILDDIR}/build-${abi}
-			abi-${abi} cmake ${default_opts} ${configure_opts} ${SRCDIR}-${abi}/${SRCSUBDIR} || die
+			: ${CMAKE_SRCDIR="${SRCDIR}-${abi}/${SRCSUBDIR}"}
+			: ${CMAKE_BUILDDIR="${BUILDDIR}/build-${abi}"}
+			cd ${CMAKE_BUILDDIR}
+			abi-${abi} cmake ${default_opts} ${configure_opts} ${CMAKE_SRCDIR} || die
 		done
 	else
+		: ${CMAKE_SRCDIR="${SRCDIR}/${SRCSUBDIR}"}
+		: ${CMAKE_BUILDDIR="${BUILDDIR}/build"}
 		cd ${BUILDDIR}/build
 		cmake ${default_opts} ${configure_opts} ${SRCDIR}/${SRCSUBDIR} || die
 	fi
@@ -176,9 +180,11 @@
 {
 	if [[ ${MULTILIB_BUILD} = true ]]
 	then
-		all-abis install -d ${BUILDDIR}/build-$(mabi) || die
+		: ${CMAKE_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
+		all-abis install -d ${CMAKE_BUILDDIR} || die
 	else
-		install -d ${BUILDDIR}/build || die
+		: ${CMAKE_BUILDDIR="${BUILDDIR}/build"}
+		install -d ${CMAKE_BUILDDIR} || die
 	fi
 }
 
@@ -186,15 +192,18 @@
 {
 	if [[ ${MULTILIB_BUILD} = true ]]
 	then
-		mmake -C ${BUILDDIR}/build-$(mabi) "$@" || die
+		: ${CMAKE_BUILDDIR="${BUILDDIR}/build-$(mabi)"}
+		mmake -C ${CMAKE_BUILDDIR} "$@" || die
 	else
-		mmake -C ${BUILDDIR}/build "$@" || die
+		: ${CMAKE_BUILDDIR="${BUILDDIR}/build"}
+		mmake -C ${CMAKE_BUILDDIR} "$@" || die
 	fi
 }
 
 cmake_src_compile()
 {
-	cd ${SRCDIR}
+	: ${CMAKE_SRCDIR="${SRCDIR}"}
+	cd ${CMAKE_SRCDIR}
 
 	cmake_setup_builddir || die
 	cmake_configure "$@" || die
@@ -203,7 +212,8 @@
 
 cmake_src_check()
 {
-	#cd ${BUILDDIR}/build
+	#: ${CMAKE_BUILDDIR="${BUILDDIR}/build"}
+	#cd ${CMAKE_BUILDDIR}
 	#mmake -j1 -k check || die
 	return 0
 }
@@ -217,7 +227,8 @@
 	#[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
 	#for abi in ${abis_to_run}
 	#do
-	#	cd ${BUILDDIR}/build-${abi}
+	#	: ${CMAKE_BUILDDIR="${BUILDDIR}/build-${abi}"}
+	#	cd ${CMAKE_BUILDDIR}
 	#	mmake -j1 -k check || die
 	#done
 	return 0
@@ -225,14 +236,16 @@
 
 cmake_src_install()
 {
+	: ${CMAKE_SRCDIR="${SRCDIR}"}
+
 	cmake_mmake DESTDIR=${BINDIR} install || die
 
-	cd ${SRCDIR}
+	cd ${CMAKE_SRCDIR}
 	local i
 	for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
 		FAQ LICENSE NEWS README TODO
 	do
-		if [ -f ${SRCDIR}/${i} ]
+		if [ -f ${CMAKE_SRCDIR}/${i} ]
 		then
 			minstalldocs ${i} || die
 		fi
@@ -250,12 +263,14 @@
 	[[ ! -z ${MULTILIB_ONLY_ABI} ]] && abis_to_run="${MULTILIB_ONLY_ABI}"
 	for abi in ${abis_to_run}
 	do
-		cd ${SRCDIR}-${abi}
+		: ${CMAKE_SRCDIR="${SRCDIR}-${abi}"}
+
+		cd ${CMAKE_SRCDIR}
 		local i
 		for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
 			FAQ LICENSE NEWS README TODO
 		do
-			if [ -f ${SRCDIR}-${abi}/${i} ]
+			if [ -f ${CMAKE_SRCDIR}/${i} ]
 			then
 				minstalldocs ${i} || die
 			fi