svn commit: r359293 - in head: . share/mk

[Emmanuel Vadot]

Author: manu
Date: Wed Mar 25 01:35:13 2020
New Revision: 359293
URL: https://svnweb.freebsd.org/changeset/base/359293

Log:
  Re-apply r359267 now that tools are using the proper include path
  
  Original commit message:
  bsd.lib.mk: Do not include bsd.incs.mk for INTERNALLIB
  
  f we're building an internal lib do not bother including bsd.incs.mk so we
  will not install the headers.
  This also "solves" a problem with pkgbase where a libXXX-development package
  is created and due to how packages are created we add a dependency to a
  libXXX package that doesn't exists.

Modified:
  head/ObsoleteFiles.inc
  head/share/mk/bsd.lib.mk

Modified: head/ObsoleteFiles.inc
==============================================================================
--- head/ObsoleteFiles.inc	Wed Mar 25 01:32:16 2020	(r359292)
+++ head/ObsoleteFiles.inc	Wed Mar 25 01:35:13 2020	(r359293)
@@ -36,6 +36,11 @@
 #   xargs -n1 | sort | uniq -d;
 # done
 
+# 20200323: INTERNALLIB don't install headers anymore
+OLD_FILES+=usr/include/libelftc.h
+OLD_FILES+=usr/include/libifconfig.h
+OLD_FILES+=usr/include/libpmcstat.h
+
 # 20200320: cx and ctau drivers retired
 OLD_FILES+=usr/share/man/man4/ctau.4.gz
 OLD_FILES+=usr/share/man/man4/cx.4.gz

Modified: head/share/mk/bsd.lib.mk
==============================================================================
--- head/share/mk/bsd.lib.mk	Wed Mar 25 01:32:16 2020	(r359292)
+++ head/share/mk/bsd.lib.mk	Wed Mar 25 01:35:13 2020	(r359293)
@@ -489,7 +489,10 @@ _libinstall:
 .include <bsd.nls.mk>
 .include <bsd.confs.mk>
 .include <bsd.files.mk>
+#No need to install header for INTERNALLIB
+.if !defined(INTERNALLIB)
 .include <bsd.incs.mk>
+.endif
 .endif
 
 LINKOWN?=	${LIBOWN}