--- trunk/include/python3.sminc	2017/10/11 09:28:16	29775
+++ trunk/include/python3.sminc	2017/10/13 08:43:20	29821
@@ -1,8 +1,8 @@
 # $Id$
 
 MAGE_PYTHON3_EXEC="/usr/bin/python3"
-MAGE_PYTHON3_SRCSUBDIR="python3"
-SRCSUBDIR="${MAGE_PYTHON3_SRCSUBDIR}"
+MAGE_PYTHON3_SRCSUBDIR="${BUILDDIR}/python3"
+#SRCSUBDIR="${MAGE_PYTHON2_SRCSUBDIR}"
 export MAGE_PYTHON_EXEC="${MAGE_PYTHON3_EXEC}"
 export PYTHON="${MAGE_PYTHON3_EXEC}"
 
@@ -11,6 +11,21 @@
 
 sminclude python
 
+mget-python3-version()
+{
+	MAGE_PYTHON_EXEC="${MAGE_PYTHON3_EXEC}" mget-python-version
+}
+
+mget-python3-libdir()
+{
+	MAGE_PYTHON_EXEC="${MAGE_PYTHON3_EXEC}" mget-python-libdir
+}
+
+mget-python3-includedir()
+{
+	MAGE_PYTHON_EXEC="${MAGE_PYTHON3_EXEC}" mget-python-includedir
+}
+
 python3_docompile()
 {
 	MAGE_PYTHON_EXEC="${MAGE_PYTHON3_EXEC}" python_docompile $@
@@ -24,7 +39,8 @@
 python3_src_prepare()
 {
 	python_src_prepare || die
-	install -d ${SRCDIR}/${MAGE_PYTHON3_SRCSUBDIR}
+	install -d ${MAGE_PYTHON3_SRCSUBDIR}
+	mv ${SRCDIR} ${MAGE_PYTHON3_SRCSUBDIR}/ || die
 }
 
 python3_multilib_src_prepare()
@@ -32,14 +48,19 @@
 	munpack ${SRCFILE} || die
 	for abi in ${MULTILIB_ABIS}
 	do
-		install -d ${SRCDIR}-${abi}/${MAGE_PYTHON3_SRCSUBDIR}
+		install -d ${MAGE_PYTHON3_SRCSUBDIR}
+		mv ${SRCDIR}-${abi} ${MAGE_PYTHON3_SRCSUBDIR}/ || die
 	done
 }
 
 python3_src_compile()
 {
-	cd ${SRCDIR}/${MAGE_PYTHON3_SRCSUBDIR}
-	python3_docompile || die
+	local saved_SRCDIR="${SRCDIR}"
+	SRCDIR="${MAGE_PYTHON3_SRCSUBDIR}/$(basename ${saved_SRCDIR})"
+
+	cd ${SRCDIR}
+	python3_docompile $@ || die
+	SRCDIR="${saved_SRCDIR}"
 }
 
 python3_multilib_src_compile()
@@ -49,9 +70,9 @@
 
 	for abi in ${MULTILIB_ABIS}
 	do
-		SRCDIR="${saved_SRCDIR}-${abi}/${MAGE_PYTHON3_SRCSUBDIR}"
+		SRCDIR="${MAGE_PYTHON3_SRCSUBDIR}/$(basename ${saved_SRCDIR}-${abi})"
 		cd ${SRCDIR}
-		abi-${abi} python3_docompile || die
+		abi-${abi} python3_docompile $@ || die
 	done
 	SRCDIR="${saved_SRCDIR}"
 }
@@ -63,8 +84,11 @@
 
 python3_src_install()
 {
-	cd ${SRCDIR}/${MAGE_PYTHON3_SRCSUBDIR}
-	python3_doinstall || die
+	local saved_SRCDIR="${SRCDIR}"
+	SRCDIR="${MAGE_PYTHON3_SRCSUBDIR}/$(basename ${saved_SRCDIR})"
+
+	cd ${SRCDIR}
+	python3_doinstall $@ || die
 
 	local i
 	for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \
@@ -75,6 +99,7 @@
 			minstalldocs ${i} || die
 		fi
 	done
+	SRCDIR="${saved_SRCDIR}"
 }
 
 python3_multilib_src_install()
@@ -84,9 +109,9 @@
 
 	for abi in ${MULTILIB_ABIS}
 	do
-		SRCDIR="${saved_SRCDIR}-${abi}/${MAGE_PYTHON3_SRCSUBDIR}"
+		SRCDIR="${MAGE_PYTHON3_SRCSUBDIR}/$(basename ${saved_SRCDIR}-${abi})"
 		cd ${SRCDIR}
-		abi-${abi} python3_doinstall || die
+		abi-${abi} python3_doinstall $@ || die
 
 		local i
 		for i in ABOUT-NLS AUTHORS BUGS CHANGES ChangeLog COPYING \