From 074052a706daaeb59193cf191b094b96c4f2a242 Mon Sep 17 00:00:00 2001
From: Lucio Andrés Illanes Albornoz (arab, vxp) <lucio@lucioillanes.de>
Date: Dec 04 2017 21:35:22 +0000
Subject: vars/build.vars:minipix: install into ${PREFIX}/minipix_dist.

vars/dist_minipix.vars: install into ${PREFIX_MINIPIX}.
vars/xz_minipix.vars: removed.

---

diff --git a/vars/build.vars b/vars/build.vars
index 5de75b2..a4f840a 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -1043,7 +1043,7 @@ DIST_MINIPIX_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 DIST_MINIPIX_PACKAGES="
 bzip2_minipix gzip_minipix xz_minipix bash_minipix coreutils_minipix
 nano_minipix tar_minipix mintty_minipix ntctty_minipix ptycon_minipix";
-DIST_MINIPIX_PREFIX="${PREFIX_MINIPIX}";
+DIST_MINIPIX_PREFIX="${PREFIX}/minipix_dist";
 : ${PKG_BZIP2_MINIPIX_INHERIT_FROM:=bzip2};
 : ${PKG_BZIP2_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/bzip2-build-minipix};
 : ${PKG_BZIP2_MINIPIX_BUILD_STEPS_DISABLE:="install_make"};
diff --git a/vars/dist_minipix.vars b/vars/dist_minipix.vars
index 7b86707..dbfcead 100644
--- a/vars/dist_minipix.vars
+++ b/vars/dist_minipix.vars
@@ -3,10 +3,10 @@
 #
 
 pkg_dist_minipix_all() {
-	local _dist_pfx="${PREFIX}/minipix_dist" _bin_pname _lib_name;
+	local _dist_pfx="${PREFIX_MINIPIX}" _bin_pname _lib_name;
 	ex_rtl_fileop rm "${_dist_pfx}";
 	ex_rtl_fileop mkdir "${_dist_pfx}";
-	for _bin_pname in $(find "${PREFIX_MINIPIX}/bin" -not -name "lib*"); do
+	for _bin_pname in $(find "${PREFIX}/minipix_dist/bin" -not -name "lib*"); do
 		ex_rtl_fileop cp_follow "${_bin_pname}"	"${_dist_pfx}/bin";
 	done;
 	for _lib_name in libc.so libncursesw.so.6 libpsxscl.so libu16ports.so.0; do
diff --git a/vars/xz_minipix.vars b/vars/xz_minipix.vars
deleted file mode 100644
index 45b2377..0000000
--- a/vars/xz_minipix.vars
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# set -o errexit -o noglob are assumed.
-#
-
-pkg_xz_minipix_install_make() {
-	make LIBTOOL=slibtool -C src/lzmainfo install-binPROGRAMS DESTDIR=${PREFIX_MINIPIX};
-	make LIBTOOL=slibtool -C src/scripts install-nodist_binSCRIPTS DESTDIR=${PREFIX_MINIPIX};
-	make LIBTOOL=slibtool -C src/xz install-binPROGRAMS DESTDIR=${PREFIX_MINIPIX};
-	make LIBTOOL=slibtool -C src/xzdec install-binPROGRAMS DESTDIR=${PREFIX_MINIPIX};
-};
-
-# vim:filetype=sh