vars/build.vars: replaces dist_minipix_{libs,links} w/ dist_minipix.

vars/dist_minipix.vars: install binaries, libraries, and terminfo into ${PREFIX}/minipix_dist/bin.
subr/ex_rtl_fileop.subr: adds cp_follow.

5 files changed, 32 insertions, 37 deletions

diff --git a/subr/ex_rtl_fileop.subr b/subr/ex_rtl_fileop.subr
index 62457835..e99ee773 100644
--- a/subr/ex_rtl_fileop.subr
+++ b/subr/ex_rtl_fileop.subr
@@ -19,6 +19,16 @@ ex_rtl_fileop() {
 			exp_rtl_fileop_check "${PREFIX}" "${1}";
 			cd -- "${1}";
 		fi; ;;
+	cp_follow)
+		if [ ${#} -lt 2 ]; then
+			ex_rtl_log_msg failexit "Missing parameters (in: cp_follow ${*}.)";
+		else
+			_src="${*}"; _src="${_src% *}";
+			_dst="${*}"; _dst="${_dst##* }";
+			ex_rtl_log_msg vvvo "Copying \`${_src}' into \`${_dst}' w/ -pLR.";
+			exp_rtl_fileop_check "${PREFIX}" "${*}";
+			cp -pLR -- "${@}";
+		fi; ;;
 	cp)	if [ ${#} -lt 2 ]; then
 			ex_rtl_log_msg failexit "Missing parameters (in: cp ${*}.)";
 		else
diff --git a/vars/build.vars b/vars/build.vars
index faa1ccdf..9cf4b117 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -1036,7 +1036,7 @@ NATIVE_PACKAGES_INET_PREFIX="${PREFIX_NATIVE}";
 #
 DIST_MINIPIX_CFLAGS_CONFIGURE="${DEFAULT_CFLAGS:+${DEFAULT_CFLAGS} }--sysroot=${PREFIX_NATIVE}";
 DIST_MINIPIX_CONFIGURE_ARGS="-C --disable-nls --host=${DEFAULT_TARGET} --prefix= --program-prefix= --target=${DEFAULT_TARGET}";
-DIST_MINIPIX_INSTALL_FILES_DESTDIR_EXTRA="@bin=lib @bin=libexec @bin=share";
+DIST_MINIPIX_INSTALL_FILES_DESTDIR_EXTRA="@bin=lib @bin=libexec @bin=sbin @bin=share";
 DIST_MINIPIX_LDFLAGS_CONFIGURE="--sysroot=${PREFIX_NATIVE}";
 DIST_MINIPIX_MAKEFLAGS_INSTALL="PREFIX= prefix=";
 DIST_MINIPIX_PACKAGES="
@@ -1091,7 +1091,7 @@ DIST_MINIPIX_PREFIX="${PREFIX_MINIPIX}";
 # Build target dist_target
 #
 DIST_TARGET_NO_LOG_VARS=1;
-DIST_TARGET_PACKAGES="dist_minipix_libs dist_minipix_links dist_etc dist_digest dist_tarballs";
+DIST_TARGET_PACKAGES="dist_minipix dist_etc dist_digest dist_tarballs";
 
 #
 # Build targets
diff --git a/vars/dist_minipix.vars b/vars/dist_minipix.vars
new file mode 100644
index 00000000..7b86707d
--- /dev/null
+++ b/vars/dist_minipix.vars
@@ -0,0 +1,20 @@
+#
+# set -o errexit -o noglob are assumed.
+#
+
+pkg_dist_minipix_all() {
+	local _dist_pfx="${PREFIX}/minipix_dist" _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
+		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
+		ex_rtl_fileop cp_follow					\
+			"${PREFIX_NATIVE}/lib/${_lib_name}" "${_dist_pfx}/bin";
+	done;
+	tar -C "${PREFIX_NATIVE}/share" -cpf - terminfo			|\
+		tar -C "${_dist_pfx}/bin" -xpf -;
+};
+
+# vim:filetype=sh
diff --git a/vars/dist_minipix_libs.vars b/vars/dist_minipix_libs.vars
deleted file mode 100644
index 74d0ecc1..00000000
--- a/vars/dist_minipix_libs.vars
+++ /dev/null
@@ -1,17 +0,0 @@
-#
-# set -o errexit -o noglob are assumed.
-#
-
-pkg_dist_minipix_libs_all() {
-	local _libname;
-	for _libname in libc.so libncursesw.so.6 libpsxscl.so libu16ports.so.0; do
-		ex_rtl_fileop cp						\
-			"${PREFIX_NATIVE}/lib/${_libname}" "${PREFIX_MINIPIX}/lib";
-	done;
-	tar -C "${BUILD_WORKDIR}" -cpf - "mintty-native-${PKG_TARGET}"	|\
-		tar -C "${PREFIX_MINIPIX}" -xpf -;
-	tar -C "${PREFIX_NATIVE}" -cpf - share/terminfo			|\
-		tar -C "${PREFIX_MINIPIX}" -xpf -;
-};
-
-# vim:filetype=sh
diff --git a/vars/dist_minipix_links.vars b/vars/dist_minipix_links.vars
deleted file mode 100644
index af4a99f9..00000000
--- a/vars/dist_minipix_links.vars
+++ /dev/null
@@ -1,18 +0,0 @@
-#
-# set -o errexit -o noglob are assumed.
-#
-
-pkg_dist_minipix_links_all() {
-	local _pname _pname_tgt;
-	ex_rtl_fileop rm "${PREFIX_MINIPIX}/lib"	\
-		"${PREFIX_MINIPIX}/libexec" "${PREFIX_MINIPIX}/share";
-	for _pname in $(find "${PREFIX_MINIPIX}" -type l); do
-		_pname_tgt="$(readlink -e "${_pname}")";
-		if ex_rtl_fileop test "${_pname_tgt}"; then
-			ex_rtl_fileop rm "${_pname}";
-			ex_rtl_fileop cp "${_pname_tgt}" "${_pname}";
-		fi;
-	done;
-};
-
-# vim:filetype=sh