1 files changed, 13 insertions, 4 deletions
diff --git a/groups/800.minipix.group b/groups/800.minipix.group
index d7470d7a..f5db9617 100644
--- a/groups/800.minipix.group
+++ b/groups/800.minipix.group
@@ -26,20 +26,29 @@ MINIPIX_RPM_DISABLE=1;
 # 3rd party packages
 : ${PKG_BASH_MINIPIX_INHERIT_FROM:=bash};
 : ${PKG_BASH_MINIPIX_BUILD_STEPS_DISABLE:=install_make};
-: ${PKG_BASH_MINIPIX_INSTALL_FILES:="../obj/bash=bin/ ../obj/bashbug=bin/"};
+: ${PKG_BASH_MINIPIX_INSTALL_FILES_V2:="
+	+../obj/bash=bin/%[FNAME]
+	+../obj/bashbug=bin/%[FNAME]"};
 : ${PKG_BZIP2_MINIPIX_INHERIT_FROM:=bzip2};
 : ${PKG_BZIP2_MINIPIX_BUILD_STEPS_DISABLE:="install_make"};
-: ${PKG_BZIP2_MINIPIX_INSTALL_FILES:="../bzip2-${PKG_BZIP2_VERSION}/bzip2=bin/ @bzip2=bin/bunzip2 @bzip2=bin/bzcat @bzip2=bin/bzip2recover @bzip2=bin/bzgrep @bzip2=bin/bzmore @bzip2=bin/bzdiff"};
+: ${PKG_BZIP2_MINIPIX_INSTALL_FILES_V2:="
+	+../bzip2-${PKG_BZIP2_VERSION}/bzip2=bin/%[FNAME]
+	@bzip2=bin/bunzip2
+	@bzip2=bin/bzcat
+	@bzip2=bin/bzdiff
+	@bzip2=bin/bzgrep
+	@bzip2=bin/bzip2recover
+	@bzip2=bin/bzmore"};
 : ${PKG_BZIP2_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="-f Makefile"};
 : ${PKG_CA_CERTIFICATES_MINIPIX_INHERIT_FROM:=ca_certificates};
 : ${PKG_COREUTILS_MINIPIX_INHERIT_FROM:=coreutils};
 : ${PKG_COREUTILS_MINIPIX_INSTALL_TARGET:=install-binPROGRAMS};
 : ${PKG_COREUTILS_MINIPIX_MAKEFLAGS_INSTALL_EXTRA:=INSTALL_PROGRAM=${DEFAULT_TARGET}-install-strip};
 : ${PKG_DASH_MINIPIX_INHERIT_FROM:=dash};
-: ${PKG_DASH_MINIPIX_INSTALL_FILES:=bin/dash=bin/sh};
+: ${PKG_DASH_MINIPIX_INSTALL_FILES_V2:="+bin/dash=bin/sh"};
 : ${PKG_DIFFUTILS_MINIPIX_INHERIT_FROM:=diffutils};
 : ${PKG_DROPBEAR_MINIPIX_INHERIT_FROM:=dropbear};
-: ${PKG_DROPBEAR_MINIPIX_INSTALL_FILES:=sbin/dropbear=bin/dropbear};
+: ${PKG_DROPBEAR_MINIPIX_INSTALL_FILES_V2:="+sbin/dropbear=bin/%[FNAME]"};
 : ${PKG_FINDUTILS_MINIPIX_INHERIT_FROM:=findutils};
 : ${PKG_GAWK_MINIPIX_INHERIT_FROM:=gawk};
 : ${PKG_GDB_MINIPIX_INHERIT_FROM:=gdb};