vars/build.vars:apr_util,bzip2,dos2unix,mksh,john,p7zip,st,{bzip2,bash}_minipix: fix ${PKG_INSTALL_FILES} pathnames.

1 files changed, 9 insertions, 9 deletions

diff --git a/vars/build.vars b/vars/build.vars
index 61679892..5147671a 100644
--- a/vars/build.vars
+++ b/vars/build.vars
@@ -360,13 +360,13 @@ NATIVE_PACKAGES_DEPS_PYTHON="${PREFIX}/bin/python";
 : ${PKG_APR_UTIL_URL:=http://apache.lauf-forum.at/apr/apr-util-${PKG_APR_UTIL_VERSION}.tar.bz2};
 : ${PKG_APR_UTIL_CONFIGURE_ARGS_EXTRA:="--with-apr=${BUILD_WORKDIR}/apr-native-${DEFAULT_TARGET}/obj"};
 : ${PKG_APR_UTIL_DEPS_PARENT:=apr};
-: ${PKG_APR_UTIL_INSTALL_FILES:=apu-1-config=${PREFIX}/bin/${DEFAULT_TARGET}-apu-1-config};
+: ${PKG_APR_UTIL_INSTALL_FILES:=bin/apu-1-config=${PREFIX}/bin/${DEFAULT_TARGET}-apu-1-config};
 : ${PKG_BZIP2_SHA256SUM:=a2848f34fcd5d6cf47def00461fcb528a0484d8edef8208d6d2e2909dc61d9cd};
 : ${PKG_BZIP2_VERSION:=1.0.6};
 : ${PKG_BZIP2_URL:=http://www.bzip.org/1.0.6/bzip2-${PKG_BZIP2_VERSION}.tar.gz};
 : ${PKG_BZIP2_CFLAGS_BUILD_EXTRA:=${LIB_PACKAGES_CFLAGS_CONFIGURE}};
 : ${PKG_BZIP2_IN_TREE:=1};
-: ${PKG_BZIP2_INSTALL_FILES:="@bzdiff=bin/bzcmp @bzgrep=bin/bzegrep @bzgrep=bin/bzfgrep @bzmore=bin/bzless libbz2.so.1.0=lib/ libbz2.so.1.0.6=lib/"};
+: ${PKG_BZIP2_INSTALL_FILES:="@bzdiff=bin/bzcmp @bzgrep=bin/bzegrep @bzgrep=bin/bzfgrep @bzmore=bin/bzless ../bzip2-${PKG_BZIP2_VERSION}/libbz2.so.1.0=lib/ ../bzip2-${PKG_BZIP2_VERSION}/libbz2.so.1.0.6=lib/"};
 : ${PKG_BZIP2_MAKEFLAGS_BUILD_EXTRA:=-f Makefile-libbz2_so};
 : ${PKG_BZIP2_MAKE_INSTALL_VNAME:=PREFIX};
 : ${PKG_CURL_SHA256SUM:=7f8240048907e5030f67be0a6129bc4b333783b9cca1391026d700835a788dde};
@@ -683,7 +683,7 @@ mksh sbase sed tar tcsh the_silver_searcher toilet ubase util_linux which zsh";
 : ${PKG_DOS2UNIX_URL:=http://waterlan.home.xs4all.nl/dos2unix/dos2unix-${PKG_DOS2UNIX_VERSION}.tar.gz};
 : ${PKG_DOS2UNIX_CFLAGS_BUILD_EXTRA:=${PACKAGES_CFLAGS_CONFIGURE}};
 : ${PKG_DOS2UNIX_IN_TREE:=1};
-: ${PKG_DOS2UNIX_INSTALL_FILES:="dos2unix=bin/ dos2unix=bin/ @dos2unix=bin/mac2unix @unix2dos=bin/unix2mac"};
+: ${PKG_DOS2UNIX_INSTALL_FILES:="../dos2unix-${PKG_DOS2UNIX_VERSION}/dos2unix=bin/ ../dos2unix-${PKG_DOS2UNIX_VERSION}/unix2dos=bin/ @dos2unix=bin/mac2unix @unix2dos=bin/unix2mac"};
 : ${PKG_ED_SHA256SUM:=c3521a607b3dfd5d2a087d53a72cdf71970763059c369cb0b330881b8491cd50};
 : ${PKG_ED_VERSION:=1.14.2};
 : ${PKG_ED_URL:=https://fossies.org/linux/privat/ed-${PKG_ED_VERSION}.tar.gz};
@@ -712,7 +712,7 @@ mksh sbase sed tar tcsh the_silver_searcher toilet ubase util_linux which zsh";
 : ${PKG_MKSH_BUILD_STEPS_DISABLE:=install_make};
 : ${PKG_MKSH_ENV_VARS_EXTRA:="CC=${DEFAULT_TARGET}-gcc:CFLAGS=${PACKAGES_CFLAGS_CONFIGURE:+${PACKAGES_CFLAGS_CONFIGURE} }-DMKSH_NOPROSPECTOFWORK"};
 : ${PKG_MKSH_IN_TREE:=1};
-: ${PKG_MKSH_INSTALL_FILES:="mksh=bin/ /=share/doc/mksh/examples dot.mkshrc=share/doc/mksh/examples/ mksh.1=share/man/man1/"};
+: ${PKG_MKSH_INSTALL_FILES:="../mksh/mksh=bin/ /=share/doc/mksh/examples ../mksh/dot.mkshrc=share/doc/mksh/examples/ ../mksh/mksh.1=share/man/man1/"};
 : ${PKG_MKSH_SUBDIR:=mksh};
 : ${PKG_SBASE_URLS_GIT:="sbase=http://git.suckless.org/sbase@master"};
 : ${PKG_SBASE_IN_TREE:=1};
@@ -846,7 +846,7 @@ p7zip procps_ng qpdf rxvt_unicode st tmux vim xeyes xwd";
 : ${PKG_JOHN_BUILD_STEPS_DISABLE:=install_make};
 : ${PKG_JOHN_DISABLED_NT32:=1};
 : ${PKG_JOHN_IN_TREE:=1};
-: ${PKG_JOHN_INSTALL_FILES:="run/john=bin/ run/mailer=bin/ run/makechr=bin/ run/relbench=bin/ run/unafs=bin/ run/unique=bin/ run/unshadow=bin/ /=share/john run/ascii.chr=share/john/ run/digits.chr=share/john/ run/john.conf=share/john/ run/lm_ascii.chr=share/john/ run/password.lst=share/john/"};
+: ${PKG_JOHN_INSTALL_FILES:="../john-${PKG_JOHN_VERSION}/run/john=bin/ ../john-${PKG_JOHN_VERSION}/run/mailer=bin/ ../john-${PKG_JOHN_VERSION}/run/makechr=bin/ ../john-${PKG_JOHN_VERSION}/run/relbench=bin/ ../john-${PKG_JOHN_VERSION}/run/unafs=bin/ ../john-${PKG_JOHN_VERSION}/run/unique=bin/ ../john-${PKG_JOHN_VERSION}/run/unshadow=bin/ /=share/john ../john-${PKG_JOHN_VERSION}/run/ascii.chr=share/john/ run/digits.chr=share/john/ ../john-${PKG_JOHN_VERSION}/run/john.conf=share/john/ ../john-${PKG_JOHN_VERSION}/run/lm_ascii.chr=share/john/ ../john-${PKG_JOHN_VERSION}/run/password.lst=share/john/"};
 : ${PKG_JOHN_MAKEFLAGS_BUILD_EXTRA:="-C src midipix-x86-64"};
 : ${PKG_LESS_SHA256SUM:=f3dc8455cb0b2b66e0c6b816c00197a71bf6d1787078adeee0bcf2aea4b12706};
 : ${PKG_LESS_VERSION:=487};
@@ -869,7 +869,7 @@ p7zip procps_ng qpdf rxvt_unicode st tmux vim xeyes xwd";
 : ${PKG_P7ZIP_URLS_GIT:="p7zip-midipix.git=https://github.com/lalbornoz/p7zip-midipix.git@master"};
 : ${PKG_P7ZIP_BUILD_STEPS_DISABLE:=install_make};
 : ${PKG_P7ZIP_IN_TREE:=1};
-: ${PKG_P7ZIP_INSTALL_FILES:="bin/7za=bin/"};
+: ${PKG_P7ZIP_INSTALL_FILES:="../p7zip-midipix.git/bin/7za=bin/"};
 : ${PKG_PROCPS_NG_SHA256SUM:=b1036c109f271c7c50325b11a748236f8e58aa1dbafefb30c995ff1d05b4a1a8};
 : ${PKG_PROCPS_NG_VERSION:=3.3.12};
 : ${PKG_PROCPS_NG_URL:=https://gitlab.com/procps-ng/procps/repository/archive.tar.gz?ref=v${PKG_PROCPS_NG_VERSION}};
@@ -891,7 +891,7 @@ p7zip procps_ng qpdf rxvt_unicode st tmux vim xeyes xwd";
 : ${PKG_ST_BUILD_STEPS_DISABLE:=install_make};
 : ${PKG_ST_CFLAGS_BUILD_EXTRA:=${LEAF_PACKAGES_CFLAGS_CONFIGURE} -I${PREFIX_NATIVE}/include/freetype2 -I${PREFIX_NATIVE}/include};
 : ${PKG_ST_IN_TREE:=1};
-: ${PKG_ST_INSTALL_FILES:=st=bin/ st.1=share/man/man1/ st.info=bin/};
+: ${PKG_ST_INSTALL_FILES:=../st-${PKG_ST_VERSION}/st=bin/ ../st-${PKG_ST_VERSION}/st.1=share/man/man1/ ../st-${PKG_ST_VERSION}/st.info=bin/};
 : ${PKG_ST_LDFLAGS_BUILD_EXTRA:=-L${PREFIX_NATIVE}/lib -lX11 -lXft -lfreetype -lfontconfig};
 : ${PKG_TMUX_SHA256SUM:=55313e132f0f42de7e020bf6323a1939ee02ab79c48634aa07475db41573852b};
 : ${PKG_TMUX_VERSION:=2.3};
@@ -1059,7 +1059,7 @@ 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"};
-: ${PKG_BZIP2_MINIPIX_INSTALL_FILES:="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:="../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_LDFLAGS_BUILD_EXTRA:="--sysroot=${PREFIX_NATIVE} -mvrfs"};
 : ${PKG_BZIP2_MINIPIX_MAKEFLAGS_BUILD_EXTRA:="-f Makefile"};
 : ${PKG_GZIP_MINIPIX_INHERIT_FROM:=gzip};
@@ -1074,7 +1074,7 @@ DIST_MINIPIX_PREFIX="${PREFIX}/minipix_dist";
 : ${PKG_BASH_MINIPIX_INHERIT_FROM:=bash};
 : ${PKG_BASH_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/bash-build-minipix};
 : ${PKG_BASH_MINIPIX_BUILD_STEPS_DISABLE:=install_make};
-: ${PKG_BASH_MINIPIX_INSTALL_FILES:="bash=bin/ bashbug=bin/"};
+: ${PKG_BASH_MINIPIX_INSTALL_FILES:="../obj/bash=bin/ ../obj/bashbug=bin/"};
 : ${PKG_BASH_MINIPIX_LDFLAGS_CONFIGURE_EXTRA:="-mvrfs"};
 : ${PKG_COREUTILS_MINIPIX_INHERIT_FROM:=coreutils};
 : ${PKG_COREUTILS_MINIPIX_BASE_DIR:=${BUILD_WORKDIR}/coreutils-build-minipix};