tjh.dev
nixpkgs mirror (for testing)
github.com/NixOS/nixpkgs
nix
1diff --git a/tools/build/Makefile b/tools/build/Makefile
2index 948a5f9dfdb..592af84eeae 100644
3--- a/tools/build/Makefile
4+++ b/tools/build/Makefile
5@@ -327,14 +327,14 @@ host-symlinks:
6 # and cross-tools stages. We do this here using mkdir since mtree may not exist
7 # yet (this happens if we are crossbuilding from Linux/Mac).
8 INSTALLDIR_LIST= \
9- bin \
10- lib/geom \
11- usr/include/casper \
12- usr/include/private/ucl \
13- usr/include/private/zstd \
14- usr/lib \
15- usr/libdata/pkgconfig \
16- usr/libexec
17+ ${BINDIR} \
18+ ${LIBDIR}/geom \
19+ ${INCLUDEDIR}/casper \
20+ ${INCLUDEDIR}/private/ucl \
21+ ${INCLUDEDIR}/private/zstd \
22+ ${LIBDIR} \
23+ ${LIBDIR}/libdata/pkgconfig \
24+ ${LIBEXECDIR}
25
26 installdirs:
27 mkdir -p ${INSTALLDIR_LIST:S,^,${DESTDIR}/,}
28@@ -352,9 +352,9 @@ installdirs:
29 rm -rf "${DESTDIR}/${_dir}"; \
30 fi
31 .endfor
32- ln -sfn bin ${DESTDIR}/sbin
33- ln -sfn ../bin ${DESTDIR}/usr/bin
34- ln -sfn ../bin ${DESTDIR}/usr/sbin
35+ ln -sfn bin ${DESTDIR}/${SBINDIR}
36+ ln -sfn ../bin ${DESTDIR}/${BINDIR}
37+ ln -sfn ../bin ${DESTDIR}/${SBINDIR}
38 .for _group in ${INCSGROUPS:NINCS}
39 mkdir -p "${DESTDIR}/${${_group}DIR}"
40 .endfor