aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEd Maste <emaste@FreeBSD.org>2022-11-17 00:12:18 +0000
committerEd Maste <emaste@FreeBSD.org>2022-11-17 00:15:20 +0000
commit227f47ce0c48acdb466366b136b8c522bb8937e0 (patch)
treef024b60769e6b34eb39326ce9b016b34ba2879f0
parent9198651515bf9dc5e3f1da90d4ccbc106398af4e (diff)
downloadsrc-227f47ce0c48acdb466366b136b8c522bb8937e0.tar.gz
src-227f47ce0c48acdb466366b136b8c522bb8937e0.zip
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
-rw-r--r--Makefile.libcompat1
1 files changed, 1 insertions, 0 deletions
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