[src/trunk]: src/share/mk Deprecate SYS_INCLUDE and the optional SYS_INCLUDE=...

[lukem <lukem%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/f9dfc71f1685
branches:  trunk
changeset: 539824:f9dfc71f1685
user:      lukem <lukem%NetBSD.org@localhost>
date:      Tue Nov 26 23:15:53 2002 +0000

description:
Deprecate SYS_INCLUDE and the optional SYS_INCLUDE=symlinks functionality,
and only support the "copies" default.
Per discussion on tech-userlevel@.

diffstat:

 share/mk/bsd.README  |   6 +-----
 share/mk/bsd.kinc.mk |  37 ++-----------------------------------
 share/mk/bsd.own.mk  |   7 +------
 3 files changed, 4 insertions(+), 46 deletions(-)

diffs (108 lines):

diff -r df9d2292a0d0 -r f9dfc71f1685 share/mk/bsd.README
--- a/share/mk/bsd.README       Tue Nov 26 23:07:36 2002 +0000
+++ b/share/mk/bsd.README       Tue Nov 26 23:15:53 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.README,v 1.106 2002/09/27 21:37:55 thorpej Exp $
+#      $NetBSD: bsd.README,v 1.107 2002/11/26 23:15:53 lukem Exp $
 #      @(#)bsd.README  8.2 (Berkeley) 4/2/94
 
 This is the README file for the new make "include" files for the BSD
@@ -336,10 +336,6 @@
 
 MANZ           Compress manual pages at installation time.
 
-SYS_INCLUDE    Copy or symlink kernel include files into /usr/include.
-               Possible values are "symlinks" or "copies" (which is
-               the same as the variable being unset).
-
 NOPROFILE      Do not build profiled versions of system libraries
 
 NOPIC          Do not build PIC versions of system libraries, and
diff -r df9d2292a0d0 -r f9dfc71f1685 share/mk/bsd.kinc.mk
--- a/share/mk/bsd.kinc.mk      Tue Nov 26 23:07:36 2002 +0000
+++ b/share/mk/bsd.kinc.mk      Tue Nov 26 23:15:53 2002 +0000
@@ -1,23 +1,11 @@
-#      $NetBSD: bsd.kinc.mk,v 1.24 2002/10/22 18:48:27 perry Exp $
+#      $NetBSD: bsd.kinc.mk,v 1.25 2002/11/26 23:15:54 lukem Exp $
 
-# System configuration variables:
-#
-# SYS_INCLUDE  "symlinks": symlinks to include directories are created.
-#              This may not work 100% properly for all headers.
-#
-#              "copies": directories are made, if necessary, and headers
-#              are installed into them.
-#
 # Variables:
 #
 # INCSDIR      Directory to install includes into (and/or make, and/or
 #              symlink, depending on what's going on).
 #
-# KDIR         Kernel directory to symlink to, if SYS_INCLUDE is symlinks.
-#              If unspecified, no action will be taken when making include
-#              for the directory if SYS_INCLUDE is symlinks.
-#
-# INCS         Headers to install, if SYS_INCLUDE is copies.
+# INCS         Headers to install.
 #
 # DEPINCS      Headers to install which are built dynamically.
 #
@@ -35,28 +23,9 @@
 .PHONY:                incinstall
 includes:      ${INCS} incinstall
 
-##### Default values
-# Change SYS_INCLUDE in bsd.own.mk or /etc/mk.conf to "symlinks" if you
-# don't want copies
-SYS_INCLUDE?=  copies
-
-# If DESTDIR is set, we're probably building a release, so force "copies".
-.if defined(DESTDIR) && (${DESTDIR} != "/" && !empty(DESTDIR))
-SYS_INCLUDE=   copies
-.endif
-
 ##### Install rules
 incinstall::   # ensure existence
 
-.if ${SYS_INCLUDE} == "symlinks"
-
-# don't install includes, just make symlinks.
-.if defined(KDIR)
-SYMLINKS+=     ${KDIR} ${INCSDIR}
-.endif
-
-.else # ${SYS_INCLUDE} != "symlinks"
-
 # make sure the directory is OK, and install includes.
 incinstall::   ${DESTDIR}${INCSDIR}
 .PRECIOUS:     ${DESTDIR}${INCSDIR}
@@ -93,8 +62,6 @@
 
 .undef _F
 
-.endif # ${SYS_INCLUDE} ?= "symlinks"
-
 .if defined(SYMLINKS) && !empty(SYMLINKS)
 incinstall::
        @(set ${SYMLINKS}; \
diff -r df9d2292a0d0 -r f9dfc71f1685 share/mk/bsd.own.mk
--- a/share/mk/bsd.own.mk       Tue Nov 26 23:07:36 2002 +0000
+++ b/share/mk/bsd.own.mk       Tue Nov 26 23:15:53 2002 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.own.mk,v 1.318 2002/11/26 19:51:16 thorpej Exp $
+#      $NetBSD: bsd.own.mk,v 1.319 2002/11/26 23:15:53 lukem Exp $
 
 .if !defined(_BSD_OWN_MK_)
 _BSD_OWN_MK_=1
@@ -312,11 +312,6 @@
 HOST_INSTALL_FILE?=    ${INSTALL} ${COPY} ${PRESERVE} ${RENAME}
 .endif
 
-# Define SYS_INCLUDE to indicate whether you want symbolic links to the system
-# source (``symlinks''), or a separate copy (``copies''); (latter useful
-# in environments where it's not possible to keep /sys publicly readable)
-#SYS_INCLUDE=  symlinks
-
 # Data-driven table using make variables to control how 
 # toolchain-dependent targets and shared libraries are built
 # for different platforms and object formats.