0157c5f328
There are a number of packages that we ought to be able to autocall, but cannot because we need to add manual arguments just to avoid splicing. This sucks but is the right call for now --- the conclusion should be not that auto-calling is bad, but that splicing is bad. This tries to do nothing but move things around; hashes are almost unchanged. @rhelmot then has more changes to do on top of this, which will be easier to review since code will be modified in place rather than moved around and modified at the same time.
43 lines
1.1 KiB
Diff
43 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,15 +327,15 @@ 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/casper \
|
|
- lib/geom \
|
|
- usr/include/casper \
|
|
- usr/include/private/ucl \
|
|
- usr/include/private/zstd \
|
|
- usr/lib \
|
|
- usr/libdata/pkgconfig \
|
|
- usr/libexec
|
|
+ ${BINDIR} \
|
|
+ ${LIBDIR}/casper \
|
|
+ ${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
|