646b892680
Some checks failed
Periodic Merges (6h) / master → staging-nixos (push) Failing after 12m50s
Periodic Merges (6h) / master → staging-next (push) Failing after 12m54s
Periodic Merges (24h) / merge-base(master,staging) → haskell-updates (push) Failing after 11m54s
Periodic Merges (6h) / staging-next → staging (push) Failing after 12m13s
Periodic Merges (24h) / staging-next-25.05 → staging-25.05 (push) Failing after 13m24s
Periodic Merges (24h) / release-25.05 → staging-next-25.05 (push) Failing after 14m28s
41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
diff --git a/tools/build/Makefile b/tools/build/Makefile
|
|
index 948a5f9dfdb..592af84eeae 100644
|
|
--- a/tools/build/Makefile
|
|
+++ b/tools/build/Makefile
|
|
@@ -327,14 +327,14 @@ host-symlinks:
|
|
# and cross-tools stages. We do this here using mkdir since mtree may not exist
|
|
# yet (this happens if we are crossbuilding from Linux/Mac).
|
|
INSTALLDIR_LIST= \
|
|
- bin \
|
|
- lib/geom \
|
|
- usr/include/casper \
|
|
- usr/include/private/ucl \
|
|
- usr/include/private/zstd \
|
|
- usr/lib \
|
|
- usr/libdata/pkgconfig \
|
|
- usr/libexec
|
|
+ ${BINDIR} \
|
|
+ ${LIBDIR}/geom \
|
|
+ ${INCLUDEDIR}/casper \
|
|
+ ${INCLUDEDIR}/private/ucl \
|
|
+ ${INCLUDEDIR}/private/zstd \
|
|
+ ${LIBDIR} \
|
|
+ ${LIBDIR}/libdata/pkgconfig \
|
|
+ ${LIBEXECDIR}
|
|
|
|
installdirs:
|
|
mkdir -p ${INSTALLDIR_LIST:S,^,${DESTDIR}/,}
|
|
@@ -352,9 +352,9 @@ installdirs:
|
|
rm -rf "${DESTDIR}/${_dir}"; \
|
|
fi
|
|
.endfor
|
|
- ln -sfn bin ${DESTDIR}/sbin
|
|
- ln -sfn ../bin ${DESTDIR}/usr/bin
|
|
- ln -sfn ../bin ${DESTDIR}/usr/sbin
|
|
+ ln -sfn bin ${DESTDIR}/${SBINDIR}
|
|
+ ln -sfn ../bin ${DESTDIR}/${BINDIR}
|
|
+ ln -sfn ../bin ${DESTDIR}/${SBINDIR}
|
|
.for _group in ${INCSGROUPS:NINCS}
|
|
mkdir -p "${DESTDIR}/${${_group}DIR}"
|
|
.endfor
|