From ae9b4b3d7f41b2eb00b9a5415881b29babd5671d Mon Sep 17 00:00:00 2001
From: q66 <daniel@octaforge.org>
Date: Wed, 23 Dec 2020 01:15:10 +0100
Subject: [PATCH] python-tkinter: simplify destdir and lib handling

---
 srcpkgs/python-tkinter/template | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/srcpkgs/python-tkinter/template b/srcpkgs/python-tkinter/template
index d2d2198249..85e80035fa 100644
--- a/srcpkgs/python-tkinter/template
+++ b/srcpkgs/python-tkinter/template
@@ -55,22 +55,21 @@ do_build() {
 
 do_install() {
 	export PATH="$PATH:$wrksrc/hostpython"
-	make DESTDIR=${wrksrc}/${pkgname}-${version}-install altinstall
+
+	mkdir -p ${wrksrc}/tmp-destdir/usr/lib
+	ln -s lib ${wrksrc}/tmp-destdir/usr/lib${XBPS_TARGET_WORDSIZE}
+
+	make DESTDIR=${wrksrc}/tmp-destdir altinstall
 
 	# We only care for the idle and tk modules.
 	vmkdir usr/bin
 	vmkdir usr/lib/python2.7/lib-dynload
-	if [ -e ${wrksrc}/${pkgname}-${version}-install/usr/lib32 ]; then
-		_libdir=lib32
-	else
-		_libdir=lib
-	fi
-	mv ${wrksrc}/${pkgname}-${version}-install/usr/bin/idle ${DESTDIR}/usr/bin/idle2.7
-	mv ${wrksrc}/${pkgname}-${version}-install/usr/lib/python2.7/idlelib \
+	mv ${wrksrc}/tmp-destdir/usr/bin/idle ${DESTDIR}/usr/bin/idle2.7
+	mv ${wrksrc}/tmp-destdir/usr/lib/python2.7/idlelib \
 		${DESTDIR}/usr/lib/python2.7/
-	mv ${wrksrc}/${pkgname}-${version}-install/usr/lib/python2.7/lib-tk \
+	mv ${wrksrc}/tmp-destdir/usr/lib/python2.7/lib-tk \
 		${DESTDIR}/usr/lib/python2.7/
-	mv ${wrksrc}/${pkgname}-${version}-install/usr/${_libdir}/python2.7/lib-dynload/_tkinter.so \
+	mv ${wrksrc}/tmp-destdir/usr/lib/python2.7/lib-dynload/_tkinter.so \
 		${DESTDIR}/usr/lib/python2.7/lib-dynload/
 	ln -sf idle2.7 ${DESTDIR}/usr/bin/idle2
 }