The branch main has been updated by emaste: URL: https://cgit.FreeBSD.org/src/commit/?id=227f47ce0c48acdb466366b136b8c522bb8937e0
commit 227f47ce0c48acdb466366b136b8c522bb8937e0 Author: Ed Maste <[email protected]> AuthorDate: 2022-11-17 00:12:18 +0000 Commit: Ed Maste <[email protected]> CommitDate: 2022-11-17 00:15:20 +0000 libcompat: avoid installing include files twice Previously some headers were getting installed twice, once as expected and then a second time as part of the compat32 library stage. Makefile.libcompat sets -DLIBRARIES_ONLY for the install make invocation which causes bsd.lib.mk to skip headers. However some headers are handled via bsd.prog.mk, which does not use LIBRARIES_ONLY. Explicitly set MK_INCLUDES=no. Reviewed by: brooks Sponsored by: The FreeBSD Foundation Differential Revision: https://reviews.freebsd.org/D37413 --- Makefile.libcompat | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile.libcompat b/Makefile.libcompat index c8a71225f802..5343b2e2480c 100644 --- a/Makefile.libcompat +++ b/Makefile.libcompat @@ -36,6 +36,7 @@ LIBCOMPATWMAKE+= ${TIME_ENV} ${LIBCOMPATWMAKEENV} ${MAKE} ${LIBCOMPATWMAKEFLAGS} MK_MAN=no MK_HTML=no LIBCOMPATIMAKE+= ${LIBCOMPATWMAKE:NINSTALL=*:NDESTDIR=*} \ ${IMAKE_INSTALL} \ + MK_INCLUDES=no \ -DLIBRARIES_ONLY _LC_LIBDIRS.yes= lib
